Updated moon jump structure & cvar defines

aMannus · Dec 28, 2024 · b454296 · b454296
1 parent 20bf851
commit b454296
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/soh/soh/Enhancements/Cheats/MoonJump.cpp b/soh/soh/Enhancements/Cheats/MoonJump.cpp
@@ -7,17 +7,20 @@ extern "C" {
 extern PlayState* gPlayState;
 }
 
-#define CVAR_NAME "gCheats.MoonJumpOnL"
-#define CVAR CVarGetInteger(CVAR_NAME, 0)
+#define CVAR_MOON_JUMP_NAME "gCheats.MoonJumpOnL"
+#define CVAR_MOON_JUMP_DEFAULT 0
+#define CVAR_MOON_JUMP_VALUE CVarGetInteger(CVAR_MOON_JUMP_NAME, CVAR_MOON_JUMP_DEFAULT)
 
-void RegisterMoonJump() {
-    COND_ID_HOOK(OnActorUpdate, ACTOR_PLAYER, CVAR, [](void* actorRef) {
-        Player* player = GET_PLAYER(gPlayState);
+void OnPlayerUpdateMoonJump() {
+    Player* player = GET_PLAYER(gPlayState);
+
+    if (player != nullptr && CHECK_BTN_ANY(gPlayState->state.input[0].cur.button, BTN_L)) {
+        player->actor.velocity.y = 6.34375f;
+    }
+}
 
-        if (player != nullptr && CHECK_BTN_ANY(gPlayState->state.input[0].cur.button, BTN_L)) {
-            player->actor.velocity.y = 6.34375f;
-        }
-    });
+void RegisterMoonJump() {
+    COND_HOOK(OnPlayerUpdate, CVAR_MOON_JUMP_VALUE, OnPlayerUpdateMoonJump);
 }
 
-static RegisterShipInitFunc initFunc(RegisterMoonJump, { CVAR_NAME });
+static RegisterShipInitFunc initFunc(RegisterMoonJump, { CVAR_MOON_JUMP_NAME });