Merge pull request #369 from RayDeeUx/geode

2.0.0-beta26 hotfix so the children stop whining
maxnut · May 9, 2024 · e4dd4b6 · e4dd4b6
2 parents 181ab12 + bd5a5f3
commit e4dd4b6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 31 deletions.
diff --git a/mod.json b/mod.json
@@ -1,5 +1,5 @@
 {
-	"geode": "2.0.0-beta.25",
+	"geode": "2.0.0-beta.26",
 	"gd": {
 		"win": "2.204"
 	},

diff --git a/res/hacks/player.json b/res/hacks/player.json
@@ -95,32 +95,6 @@
                     "on": "C3"
                 }
             ]
-        },
-        {
-            "description": "Disables the particles from the ship and the ufo.",
-            "name": "No Vehicle Particles",
-            "opcodes": [
-                {
-                    "address": "0x2D4810",
-                    "on": "90 90"
-                },
-                {
-                    "address": "0x2C2DF1",
-                    "on": "90 90"
-                },
-                {
-                    "address": "0x49E5A0",
-                    "on": "00 00 80 3F 00 00 00 00 00 00 00 00 00 00 00 00"
-                },
-                {
-                    "address": "0x49E5D0",
-                    "on": "00 00 80 3F 00 00 00 00 00 00 00 00 00 00 00 00"
-                },
-                {
-                    "address": "0x49E600",
-                    "on": "00 00 80 3F BF BE 3E 3F 00 00 00 00 00 00 00 00"
-                }
-            ]
         }
     ]
 }
diff --git a/src/Hacks/LayoutMode.cpp b/src/Hacks/LayoutMode.cpp
@@ -129,15 +129,15 @@ class $modify(ShaderLayer)
 
 class $modify(EffectGameObject)
 {
-	bool triggerObject(GJBaseGameLayer* p0, int p1, gd::vector<int> const* p2)
+	void triggerObject(GJBaseGameLayer* p0, int p1, gd::vector<int> const* p2)
 	{
 		if (!Settings::get<bool>("level/layout_mode", false))
 			return EffectGameObject::triggerObject(p0, p1, p2);
 
 		int id = this->m_objectID;
 
 		if (id == 899 || id == 1006 || id == 1007 || id == 105 || id == 29 || id == 56 || id == 915 || id == 30 || id == 58)
-			return false;
+			return;
 
 		EffectGameObject::triggerObject(p0, p1, p2);
 	}

diff --git a/src/Hacks/ShowTrajectory.cpp b/src/Hacks/ShowTrajectory.cpp
@@ -60,11 +60,11 @@ class $modify(HardStreak)
 
 class $modify(EffectGameObject)
 {
-    bool triggerObject(GJBaseGameLayer *p0, int p1, const gd::vector<int> *p2)
+    void triggerObject(GJBaseGameLayer *p0, int p1, const gd::vector<int> *p2)
     {
         //log::debug("is simulation {}", isSimulation);
         if(isSimulation)
-            return true;
+            return;
 
         return EffectGameObject::triggerObject(p0, p1, p2);
     }