Merge pull request #2 from ninXout/main

Fix macOS issues
geode-sdk · Sep 14, 2023 · 7c74285 · 7c74285
2 parents d8ba0f9 + 3f7235f
commit 7c74285
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/src/EditorUI.cpp b/src/EditorUI.cpp
@@ -10,24 +10,32 @@ struct $modify(EditorUI) {
         (void)self.setHookPriority("EditorUI::keyUp", 1000);
     }
 
+    static inline int platformButton() {
+        #ifdef GEODE_IS_MACOS
+            return 1;
+        #else
+            return 0;
+        #endif
+    }
+
     bool init(LevelEditorLayer* lel) {
         if (!EditorUI::init(lel))
             return false;
 
         this->defineKeybind("robtop.geometry-dash/jump-p1", [=](bool down) {
             if (down) {
-                m_editorLayer->pushButton(0, true);
+                m_editorLayer->pushButton(platformButton(), true);
             }
             else {
-                m_editorLayer->releaseButton(0, true);
+                m_editorLayer->releaseButton(platformButton(), true);
             }
         });
         this->defineKeybind("robtop.geometry-dash/jump-p2", [=](bool down) {
             if (down) {
-                m_editorLayer->pushButton(0, false);
+                m_editorLayer->pushButton(platformButton(), false);
             }
             else {
-                m_editorLayer->releaseButton(0, false);
+                m_editorLayer->releaseButton(platformButton(), false);
             }
         });
         this->defineKeybind("robtop.geometry-dash/build-mode", [=] {

diff --git a/src/UILayer.cpp b/src/UILayer.cpp
@@ -35,33 +35,41 @@ struct $modify(UILayer) {
         (void)self.setHookPriority("UILayer::keyUp", 1000);
     }
 
+    static inline int platformButton() {
+        #ifdef GEODE_IS_MACOS
+            return 1;
+        #else
+            return 0;
+        #endif
+    }
+
     bool init() {
         if (!UILayer::init())
             return false;
 
         this->defineKeybind("robtop.geometry-dash/jump-p1", [=](bool down) {
             if (down) {
-                PlayLayer::get()->pushButton(0, true);
+                PlayLayer::get()->pushButton(platformButton(), true);
             }
             else {
-                PlayLayer::get()->releaseButton(0, true);
+                PlayLayer::get()->releaseButton(platformButton(), true);
             }
         });
         this->defineKeybind("robtop.geometry-dash/jump-p2", [=](bool down) {
             if (down) {
-                PlayLayer::get()->pushButton(0, false);
+                PlayLayer::get()->pushButton(platformButton(), false);
             }
             else {
-                PlayLayer::get()->releaseButton(0, false);
+                PlayLayer::get()->releaseButton(platformButton(), false);
             }
         });
         this->defineKeybind("robtop.geometry-dash/place-checkpoint", [=](bool down) {
-            if (down && PlayLayer::get()->m_isPracticeMode) {
+            if (down && PlayLayer::get() && PlayLayer::get()->m_isPracticeMode) {
                 this->onCheck(nullptr);
             }
         });
         this->defineKeybind("robtop.geometry-dash/delete-checkpoint", [=](bool down) {
-            if (down && PlayLayer::get()->m_isPracticeMode) {
+            if (down && PlayLayer::get() && PlayLayer::get()->m_isPracticeMode) {
                 this->onDeleteCheck(nullptr);
             }
         });

diff --git a/src/main.cpp b/src/main.cpp
@@ -16,8 +16,7 @@ class $modify(CCKeyboardDispatcher) {
 			if (PressBindEvent(ControllerBind::create(key), down).post() == ListenerResult::Stop) {
 				return true;
 			}
-		}
-		else {
+		} else {
 			if (!keyIsModifier(key)) {
 				if (down) {
 					s_held.insert(key);