f

TheSillyDoggo · Nov 18, 2024 · 4be85f5 · 4be85f5
1 parent 21fb3f5
commit 4be85f5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,12 +19,6 @@ file(GLOB SOURCES
 	src/*/*/*.cpp
 )
 
-file(GLOB OBJC_SOURCES
-    src/*.mm
-    src/*/*.mm
-    src/*/*/*.mm
-)
-
 add_library(${PROJECT_NAME} SHARED ${SOURCES})
 
 # Windows specific settings

diff --git a/src/Client/AndroidBall.cpp b/src/Client/AndroidBall.cpp
@@ -344,7 +344,7 @@ class $modify (AppDelegate)
     }
 };
 
-void QOLModTouchDispatcher::touches(CCSet* touches, CCEvent* event, unsigned int type)
+/*void QOLModTouchDispatcher::touches(CCSet* touches, CCEvent* event, unsigned int type)
 {
     bool sendToGame = true;
 
@@ -370,4 +370,4 @@ void QOLModTouchDispatcher::touches(CCSet* touches, CCEvent* event, unsigned int
 
     if (sendToGame)
         CCTouchDispatcher::touches(touches, event, type);
-}
+}*/
diff --git a/src/Client/AndroidBall.h b/src/Client/AndroidBall.h
@@ -50,12 +50,12 @@ class AndroidBall : public CCLayer
         ~AndroidBall();
 };
 
-class $modify (QOLModTouchDispatcher, CCTouchDispatcher)
+/*class $modify (QOLModTouchDispatcher, CCTouchDispatcher)
 {
     static void onModify(auto& self)
     {
         (void)self.setHookPriority("cocos2d::CCTouchDispatcher::touches", -99999999);
     }
 
     void touches(CCSet* touches, CCEvent* event, unsigned int type);
-};
+};*/
diff --git a/src/Client/AndroidUI.cpp b/src/Client/AndroidUI.cpp
@@ -201,6 +201,9 @@ bool AndroidUI::setup()
 
 AndroidUI* AndroidUI::get()
 {
+    if (!CCScene::get())
+        return nullptr;
+
     if (auto ui = CCScene::get()->getChildByType<AndroidUI>(0))
         return ui;