diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 470b53bb0a..0645f4c707 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -6415,7 +6415,7 @@ void actOnBirthPacket(SceNetAdhocMatchingContext * context, SceNetEtherAddr * se SceNetEtherAddr mac; memcpy(&mac, context->rxbuf + 1, sizeof(SceNetEtherAddr)); - // Allocate Memory (If this fails... we are fucked.) + // Allocate Memory SceNetAdhocMatchingMemberInternal * sibling = (SceNetAdhocMatchingMemberInternal *)malloc(sizeof(SceNetAdhocMatchingMemberInternal)); // Allocated Memory diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj index 9fe46fd1b6..70bc7f2a6e 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj +++ b/UWP/NativeUWP/NativeUWP.vcxproj @@ -390,7 +390,6 @@ - diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters index b955c76d5f..eed8497fbb 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj.filters +++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters @@ -712,9 +712,6 @@ data - - data - diff --git a/ext/native/data/compression.h b/ext/native/data/compression.h index e37ff85794..5323b8f549 100644 --- a/ext/native/data/compression.h +++ b/ext/native/data/compression.h @@ -2,27 +2,6 @@ #include +// inflate/deflate convenience wrapper. Uses zlib. bool compress_string(const std::string& str, std::string *dest, int compressionlevel = 9); bool decompress_string(const std::string& str, std::string *dest); - - -// Delta encoding/decoding - many formats benefit from a pass of this before zlibbing. -// WARNING : Do not use these with floating point data, especially not float16... - -template -inline void delta(T *data, int length) { - T prev = data[0]; - for (int i = 1; i < length; i++) { - T temp = data[i] - prev; - prev = data[i]; - data[i] = temp; - } -} - -template -inline void dedelta(T *data, int length) { - for (int i = 1; i < length; i++) { - data[i] += data[i - 1]; - } -} - diff --git a/ext/native/data/listable.h b/ext/native/data/listable.h deleted file mode 100644 index 017cacf1b9..0000000000 --- a/ext/native/data/listable.h +++ /dev/null @@ -1,49 +0,0 @@ -#pragma once - -#include -#include - -class Listable -{ -public: - virtual ~Listable() {} - virtual const char *getItem(size_t i) const = 0; - virtual size_t numItems() const = 0; - - // Returns -1 for not found. - // Child classes are meant to specialize this if they have a faster way - // than brute force search. - virtual int getIndex(const char *text) { - for (size_t i = 0; i < numItems(); i++) { - if (!strcmp(getItem(i), text)) - return i; - } - return -1; - } -}; - -class ArrayListable : public Listable -{ -public: - ArrayListable(const char * const*arr, size_t count) : arr_(arr), count_(count) {} - virtual ~ArrayListable() {} - - virtual const char *getItem(size_t i) const { return arr_[i]; } - virtual size_t numItems() const { return count_; } - -private: - const char *const*arr_; - size_t count_; -}; - -class VectorListable : public Listable -{ - VectorListable(const std::vector &vec) : vec_(vec) {} - virtual ~VectorListable() {} - - virtual const char *getItem(size_t i) const { return vec_[i].c_str(); } - virtual size_t numItems() const { return vec_.size(); } - -private: - const std::vector &vec_; -}; \ No newline at end of file diff --git a/ext/native/file/chunk_file.cpp b/ext/native/file/chunk_file.cpp index 20553a8657..2dab992913 100644 --- a/ext/native/file/chunk_file.cpp +++ b/ext/native/file/chunk_file.cpp @@ -29,7 +29,6 @@ int RIFFReader::ReadInt() { return 0; } -// let's get into the business bool RIFFReader::Descend(uint32_t intoId) { if (depth_ > 30) return false; @@ -83,7 +82,6 @@ bool RIFFReader::Descend(uint32_t intoId) { return true; } -// let's ascend out void RIFFReader::Ascend() { // ascend, and restore information depth_--; @@ -91,7 +89,6 @@ void RIFFReader::Ascend() { eof_ = stack[depth_].parentEOF; } -// read a block void RIFFReader::ReadData(void *what, int count) { memcpy(what, data_ + pos_, count); pos_ += count; diff --git a/ext/native/file/chunk_file.h b/ext/native/file/chunk_file.h index 18d8a80e8b..ebc2db99a4 100644 --- a/ext/native/file/chunk_file.h +++ b/ext/native/file/chunk_file.h @@ -1,7 +1,7 @@ #pragma once -// RIFF file format reader/writer. Very old code, basically a total mess but it still works. -// Has nothing to do with the ChunkFile.h used in Dolphin or PPSSPP. +// Simple RIFF file format reader/writer. +// Unrelated to the ChunkFile.h used in Dolphin and PPSSPP. // TO REMEMBER WHEN USING: diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index ccd6b2d7f5..7e5e759400 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -390,7 +390,6 @@ - @@ -1211,4 +1210,4 @@ - + \ No newline at end of file diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index 9363be3e69..a1f06f8607 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -110,12 +110,6 @@ ui - - data - - - base - net @@ -775,9 +769,6 @@ thin3d - - base - gfx @@ -901,4 +892,4 @@ {5b740c6f-8dbc-4529-9114-6564b37b3548} - + \ No newline at end of file