From 7962e0e6d6a87e73540f809c1897510fd971695c Mon Sep 17 00:00:00 2001
From: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>
Date: Sun, 21 May 2023 18:12:25 -0400
Subject: [PATCH] Add Scene Specific Checks to Dirt Path Fixes (#2907)

* Move from Dev to Dev-Spock

* Moved to mod.h

* Update GameInteractor.h
---
 soh/soh/Enhancements/mods.cpp | 19 +++++++++++++++++++
 soh/soh/Enhancements/mods.h   |  3 +++
 soh/soh/GameMenuBar.cpp       |  7 ++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 94d8853db..36ccef505 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -486,6 +486,24 @@ void RegisterBonkDamage() {
     });
 }
 
+void UpdateDirtPathFixState(int32_t sceneNum) {
+    switch (sceneNum) {
+        case SCENE_SPOT00:
+        case SCENE_SPOT04:
+        case SCENE_SPOT15:
+            CVarSetInteger("gDirtPathFix", CVarGetInteger("gSceneSpecificDirtPathFix", 0));
+            return;
+        default:
+            CVarClear("gDirtPathFix");
+    }
+}
+
+void RegisterMenuPathFix() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnTransitionEnd>([](int32_t sceneNum) {
+        UpdateDirtPathFixState(sceneNum);
+    });
+}
+
 void InitMods() {
     RegisterTTS();
     RegisterInfiniteMoney();
@@ -504,4 +522,5 @@ void InitMods() {
     RegisterRupeeDash();
     RegisterHyperBosses();
     RegisterBonkDamage();
+    RegisterMenuPathFix();
 }
diff --git a/soh/soh/Enhancements/mods.h b/soh/soh/Enhancements/mods.h
index 99f547d3a..16effa712 100644
--- a/soh/soh/Enhancements/mods.h
+++ b/soh/soh/Enhancements/mods.h
@@ -1,3 +1,5 @@
+#include <stdint.h>
+
 #ifndef MODS_H
 #define MODS_H
 
@@ -5,6 +7,7 @@
 extern "C" {
 #endif
 
+void UpdateDirtPathFixState(int32_t sceneNum);
 void InitMods();
 
 #ifdef __cplusplus
diff --git a/soh/soh/GameMenuBar.cpp b/soh/soh/GameMenuBar.cpp
index 42ee23284..e25bf953e 100644
--- a/soh/soh/GameMenuBar.cpp
+++ b/soh/soh/GameMenuBar.cpp
@@ -29,6 +29,7 @@
 #include "soh/SaveManager.h"
 #include "OTRGlobals.h"
 #include "soh/Enhancements/presets.h"
+#include "soh/Enhancements/mods.h"
 #include "soh/resource/type/Skeleton.h"
 
 #ifdef ENABLE_CROWD_CONTROL
@@ -46,6 +47,8 @@ extern "C" {
     void disableBetaQuest() { isBetaQuestEnabled = false; }
 }
 
+extern "C" PlayState* gPlayState;
+
 enum SeqPlayers {
     /* 0 */ SEQ_BGM_MAIN,
     /* 1 */ SEQ_FANFARE,
@@ -860,7 +863,9 @@ namespace GameMenuBar {
                     ImGui::EndMenu();
                 }
                 UIWidgets::PaddedText("Fix Vanishing Paths", true, false);
-                UIWidgets::EnhancementCombobox("gDirtPathFix", zFightingOptions, 0);
+                if (UIWidgets::EnhancementCombobox("gSceneSpecificDirtPathFix", zFightingOptions, 0) && gPlayState != NULL) {
+                    UpdateDirtPathFixState(gPlayState->sceneNum);
+                }
                 UIWidgets::Tooltip("Disabled: Paths vanish more the higher the resolution (Z-fighting is based on resolution)\n"
                                    "Consistent: Certain paths vanish the same way in all resolutions\n"
                                    "No Vanish: Paths do not vanish, Link seems to sink in to some paths\n"