Merge pull request #10 from BeatACVR/main

make mod actually work again (but no android support)
NicknameGG · Nov 23, 2024 · db2a136 · db2a136
2 parents 3528a16 + bab907c
commit db2a136
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/.github/workflows/multi-platform.yml b/.github/workflows/multi-platform.yml
@@ -18,13 +18,13 @@ jobs:
         - name: macOS
           os: macos-latest
 
-        - name: Android32
-          os: ubuntu-latest
-          target: Android32
+        #- name: Android32
+        #  os: ubuntu-latest
+        #  target: Android32
 
-        - name: Android64
-          os: ubuntu-latest
-          target: Android64
+        #- name: Android64
+        #  os: ubuntu-latest
+        #  target: Android64
 
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}

diff --git a/README.md b/README.md
@@ -11,4 +11,4 @@ Get jumpscared **every time you jump** by the Robert Topala!
 - Android support!
 - Works in my machine!
 
-### Download now!!!!!!!!!!
+### Download now!!!!!!!!!!
diff --git a/about.md b/about.md
@@ -11,4 +11,4 @@ Get jumpscared **every time you jump** by the Robert Topala!
 - Android support!
 - Works in my machine!
 
-### Download now!!!!!!!!!!
+### Download now!!!!!!!!!!
diff --git a/mod.json b/mod.json
@@ -11,7 +11,7 @@
 	],
 	"id": "n.robtop-jumpscare",
 	"name": "Robtop Jumpscare",
-	"version": "v1.3.5",
+	"version": "v1.3.6",
 	"developer": "n",
 	"description": "Jumpscare yourself everytime you jump!",
 	"repository": "https://github.com/NicknameGG/robtop-jumpscare",

diff --git a/src/main.cpp b/src/main.cpp
@@ -31,18 +31,24 @@ class $modify(PlayerObject) {
     RobertTopala->runAction(CCFadeOut::create(1.0))->setTag(1);
   }
 
+  /*void playerDestroyed(bool p0) {
+    PlayerObject::playerDestroyed(p0);
+    isHolding = false;
+  }*/
+
   void playerDestroyed(bool p0) {
     PlayerObject::playerDestroyed(p0);
     isHolding = false;
   }
 
-  void releaseButton(PlayerButton p0) {
-    PlayerObject::releaseButton(p0);
+  bool releaseButton(PlayerButton p0) {
+    bool ret = PlayerObject::releaseButton(p0);
 
     if (p0 != PlayerButton::Jump)
-      return;
+      return ret;
 
     isHolding = false;
+    return false;
   }
 
   void incrementJumps() {
@@ -61,18 +67,17 @@ class $modify(PlayerObject) {
     PlayerObject::incrementJumps();
   }
 
-  void pushButton(PlayerButton p0) {
-
-    PlayerObject::pushButton(p0);
+  bool pushButton(PlayerButton p0) {
+    bool ret = PlayerObject::pushButton(p0);
 
     if (p0 != PlayerButton::Jump)
-      return;
+      return ret;
 
     isHolding = true;
 
     // Do nothing if PlayLayer doesnt exist
     if (!GameManager::sharedState()->getPlayLayer())
-      return;
+      return ret;
 
     const auto runningScene = CCDirector::get()->getRunningScene();
 
@@ -97,5 +102,6 @@ class $modify(PlayerObject) {
     }
 
     this->jumpscare();
+    return false;
   }
 };