Merge 4a40835f71 into cb8d7571dd

CHANGELOG.md

@@ -1,8 +1,5 @@
 # Geode Changelog
 
-## v4.0.1
- * Add cutoff constructor for CCRenderTexture (#1171)
-
 ## v4.0.0
  * Make chosen display type in mod list be saved between startups (07d92a3)
  * Fix `Task::all` not returning results in order (227adb0)

VERSION

@@ -1 +1 @@
-4.0.1
+4.0.0

loader/include/Geode/cocos/misc_nodes/CCRenderTexture.h

@@ -61,8 +61,6 @@ class CC_DLL CCRenderTexture : public CCNode
     */
     CC_PROPERTY(CCSprite*, m_pSprite, Sprite)
 public:
-    GEODE_CUSTOM_CONSTRUCTOR_COCOS(CCRenderTexture, CCNode)
-
     /**
      * @js ctor
      */

loader/include/Geode/cocos/support/zip_support/ZipUtils.h

@@ -155,12 +155,12 @@ namespace cocos2d
         static gd::string base64EncodeEnc(gd::string const&, gd::string);
         static gd::string base64URLDecode(gd::string const&);
         static gd::string base64URLEncode(gd::string const&);
-        static int ccDeflateMemory(unsigned char* data, unsigned int size, unsigned char** out);
+        static int ccDeflateMemory(unsigned char*, unsigned int, unsigned char**);
         static int ccDeflateMemoryWithHint(unsigned char*, unsigned int, unsigned char**, unsigned int);
-        static gd::string compressString(gd::string const& data, bool encrypt, int encryptionKey);
-        static gd::string decompressString(gd::string const& data, bool encrypt, int encryptionKey);
-        static gd::string decompressString2(unsigned char* data, bool encrypt, int size, int encryptionKey);
-        static gd::string encryptDecrypt(gd::string const& data, int encryptionKey);
+        static gd::string compressString(gd::string const&, bool, int);
+        static gd::string decompressString(gd::string const&, bool, int);
+        static gd::string decompressString2(unsigned char*, bool, int, int);
+        static gd::string encryptDecrypt(gd::string const&, int);
         static gd::string encryptDecryptWKey(gd::string const&, gd::string);
         static unsigned char hexToChar(const gd::string&);
         static gd::string urlDecode(const gd::string&);