fix bros and remove update dir on start

geode-sdk · Oct 15, 2023 · 6a3a2c9 · 6a3a2c9
1 parent 335cc44
commit 6a3a2c9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/bindings/Cocos2d.bro b/bindings/Cocos2d.bro
@@ -94,11 +94,6 @@ class cocos2d::CCCallFuncND {
 	static auto create(cocos2d::CCObject*, cocos2d::SEL_CallFuncND, void*) = mac 0x455470;
 }
 
-[[link(win, android)]]
-class cocos2d::CCCallFuncND {
-	static auto create(cocos2d::CCObject*, cocos2d::SEL_CallFuncND, void*) = mac 0x455470;
-}
-
 [[link(win, android)]]
 class cocos2d::CCClippingNode {
 	CCClippingNode() {

diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro
@@ -1078,12 +1078,12 @@ class CustomSongWidget : cocos2d::CCNode, MusicDownloadDelegate, FLAlertLayerPro
     void updatePlaybackBtn() = win 0x69970;
     void updateSongInfo() = win 0x69bf0;
     void updateSongObject(SongInfoObject* song) = win 0x69280, mac 0x37d690;
-    void onCancelDownload(CCObject*) = win 0x693b0;
-    void onDownload(CCObject*) = win 0x69540;
-    void onGetSongInfo(CCObject*) = win 0x69490;
-    void onMore(CCObject*) = win 0x68e20;
-    void onPlayback(CCObject*) = win 0x697b0;
-    void onSelect(CCObject*) = win 0x69760;
+    void onCancelDownload(cocos2d::CCObject*) = win 0x693b0;
+    void onDownload(cocos2d::CCObject*) = win 0x69540;
+    void onGetSongInfo(cocos2d::CCObject*) = win 0x69490;
+    void onMore(cocos2d::CCObject*) = win 0x68e20;
+    void onPlayback(cocos2d::CCObject*) = win 0x697b0;
+    void onSelect(cocos2d::CCObject*) = win 0x69760;
 
     SongInfoObject* m_songInfo;
     cocos2d::CCMenu* m_buttonMenu;

diff --git a/loader/src/platform/android/main.cpp b/loader/src/platform/android/main.cpp
@@ -16,6 +16,13 @@ extern "C" [[gnu::visibility("default")]] jint JNI_OnLoad(JavaVM* vm, void* rese
     glBindVertexArrayOESEXT = (PFNGLBINDVERTEXARRAYOESPROC)eglGetProcAddress("glBindVertexArrayOES");
     glDeleteVertexArraysOESEXT = (PFNGLDELETEVERTEXARRAYSOESPROC)eglGetProcAddress("glDeleteVertexArraysOES");
 
+    auto updatePath = geode::dirs::getGameDir() / "update";
+    std::error_code ec;
+    ghc::filesystem::remove_all(updatePath, ec);
+    if (ec) {
+        geode::log::warn("Failed to remove update directory: {}", ec.message());
+    }
+
     geodeEntry(nullptr);
     return JNI_VERSION_1_6;
 }