Axe disableMod

Adds too much complexity for minimal use case.

Signed-off-by: Andrew Opalach <andrew@akon.city>

3 files changed, 32 insertions, 101 deletions

diff --git a/Config.cs b/Config.cs
index 28031b0..3537a9f 100755
--- a/Config.cs
+++ b/Config.cs
@@ -137,7 +137,6 @@ namespace NewCamera
             return null;

         }

 

-        public bool DisableMod { get; set; } = false;

         public bool TuningToolInterop = true;

         public bool OverrideViewMode { get; set; } = false;

 

diff --git a/Player.cs b/Player.cs
index 762acdf..9abc16f 100644
--- a/Player.cs
+++ b/Player.cs
@@ -483,12 +483,6 @@ namespace NewCamera
 
         private static void CollisionCheckHook(nint unknownPtr, nint unknownPtr2)
         {
-            if (disableMod)
-            {
-                collisionCheckHook!.Original(unknownPtr, unknownPtr2);
-                return;
-            }
-
 #if HOOK_ORDER_ASSERTS
             debugLog($"CollisionCheckHook(0x{unknownPtr:X}, 0x{unknownPtr2:X}) @ {frameTick}");
 #endif
@@ -518,12 +512,6 @@ namespace NewCamera
 
         private static void SetZoneStateHook(nint player, int flags)
         {
-            if (disableMod)
-            {
-                setZoneStateHook!.Original(player, flags);
-                return;
-            }
-
 #if HOOK_ORDER_ASSERTS
             debugLog($"SetZoneStateHook(0x{player:X}, 0x{flags:X}) @ {frameTick}");
 #endif
@@ -570,12 +558,11 @@ namespace NewCamera
 
         private static void RefreshEntityParamsHook(nint entity, nint unknownPtr2)
         {
-            refreshEntityParamsHook!.Original(entity, unknownPtr2);
+#if HOOK_ORDER_ASSERTS
+            debugLog($"RefreshEntityParamsHook(0x{entity:X}, 0x{unknownPtr2:X}) @ {frameTick}");
+#endif
 
-            if (disableMod)
-            {
-                return;
-            }
+            refreshEntityParamsHook!.Original(entity, unknownPtr2);
 
             Player? player = getPlayerWithFallback();
             if (player != null && entity == player && playerOpacityOverride != 1.0f)
@@ -1575,7 +1562,10 @@ namespace NewCamera
 
         private static void UpdateJointRotationHook(nint model)
         {
-            if (!disableMod && usingArmorState())
+#if HOOK_ORDER_ASSERTS
+            debugLog($"UpdateJointRotationHook(0x{model:X}) @ {frameTick}");
+#endif
+            if (usingArmorState())
             {
                 Player? player = getPlayerWithFallback();
                 if (player != null && model == player.Instance)
@@ -1606,8 +1596,11 @@ namespace NewCamera
 
         private static void UpdateJointPositionHook(nint model)
         {
+#if HOOK_ORDER_ASSERTS
+            debugLog($"UpdateJointPositionHook(0x{model:X}) @ {frameTick}");
+#endif
             updateJointPositionHook!.Original(model);
-            if (!disableMod && usingArmorState())
+            if (usingArmorState())
             {
                 Player? player = getPlayerWithFallback();
                 if (player != null && model == player.Instance)
@@ -1632,7 +1625,7 @@ namespace NewCamera
 #if QUARANTINED_FEATURES
         private static void UpdateIKHook(nint superOfChild, nint joint, nint obj)
         {
-            if (!disableMod && ikOffsets.ContainsKey(joint))
+            if (ikOffsets.ContainsKey(joint))
             {
                 Vector3 offset = ikOffsets[joint][0];
                 MemoryUtil.GetRef<Vector3>(superOfChild + 0x1380) += offset;
diff --git a/Plugin.cs b/Plugin.cs
index 39ddf94..4bf07e3 100755
--- a/Plugin.cs
+++ b/Plugin.cs
@@ -188,8 +188,6 @@ namespace NewCamera
 

         public static byte ByteFlag(bool f) { return f ? (byte)0x1 : (byte)0x0; }

 

-        public static bool disableMod = false;

-

         private static readonly MtObject sMain = SingletonManager.GetSingleton("sMhMain")!;

         private bool freezeGame = false;

         private bool decoupleDtFromGameTime = false;

@@ -411,8 +409,6 @@ namespace NewCamera
         {

             Config config = ConfigManager.GetConfig<Config>(this);

 

-            disableMod = config.DisableMod;

-

             overrideViewMode = config.OverrideViewMode;

 

             Config.Settings.Binds binds = config.Binds;

@@ -551,7 +547,7 @@ namespace NewCamera
             addr = PatternScanner.FindFirst(Pattern.FromString("CC 48 89 5C 24 18 57 48 83 EC 30 48 89 74 24 48 48 8B D9 E8 ?? ?? ?? ?? 48 8B 8B B0 0D 00 00 8B 81 54 89 00 00 C1 E8 0D A8 01"));

             Assert(addr == 0x1411A6A9F);

             noopCharacterFade = new Patch(addr + 0x13, [0x90, 0x90, 0x90, 0x90, 0x90]); // call MonsterHunterWorld.exe+11A6D50.

-            if (disableCharacterFade && !disableMod)

+            if (disableCharacterFade)

             {

                 noopCharacterFade.Enable();

             }

@@ -794,11 +790,6 @@ namespace NewCamera
 

         public void OnUpdate(float deltaTime)

         {

-            if (disableMod)

-            {

-                return;

-            }

-

 #if HOOK_ORDER_ASSERTS

             Assert(hookOrder == 0 || hookOrder == 4);

             hookOrder = 0;

@@ -1428,12 +1419,6 @@ namespace NewCamera
 

         private void SetCameraHook(nint cameraPointer)

         {

-            if (disableMod)

-            {

-                setCameraHook!.Original(cameraPointer);

-                return;

-            }

-

 #if HOOK_ORDER_ASSERTS

             debugLog($"SetCameraHook(0x{cameraPointer:X}) @ {frameTick}");

             Assert(hookOrder == 0);

@@ -1477,12 +1462,6 @@ namespace NewCamera
         // If camera.Move = false, this hook won't run.

         private void CalculateCameraHook(nint cameraPointer)

         {

-            if (disableMod)

-            {

-                calculateCameraHook!.Original(cameraPointer);

-                return;

-            }

-

 #if HOOK_ORDER_ASSERTS

             debugLog($"CalculateCameraHook(0x{cameraPointer:X}) @ {frameTick}");

             Assert(hookOrder == 2);

@@ -1559,12 +1538,6 @@ namespace NewCamera
 

         private void CheckCameraHook(nint cameraPointer)

         {

-            if (disableMod)

-            {

-                checkCameraHook!.Original(cameraPointer);

-                return;

-            }

-

 #if HOOK_ORDER_ASSERTS

             debugLog($"CheckCameraHook(0x{cameraPointer:X}) @ {frameTick}");

             Assert(hookOrder == 1);

@@ -1592,17 +1565,11 @@ namespace NewCamera
 

         private void StartViewModeHook(nint viewModeObject)

         {

-            if (disableMod || !overrideViewMode)

-            {

-                startViewModeHook!.Original(viewModeObject);

-                return;

-            }

-

 #if HOOK_ORDER_ASSERTS

             debugLog($"StartViewMode(0x{viewModeObject:X}) @ {frameTick}");

 #endif

 

-            if (vCamera != null)

+            if (overrideViewMode && vCamera != null)

             {

                 enableFreeCamera = true;

                 freeCameraFromViewMode = true;

@@ -1611,12 +1578,6 @@ namespace NewCamera
 

         private void SetCameraTentHook(nint unknownPtr)

         {

-            if (disableMod)

-            {

-                setCameraTentHook!.Original(unknownPtr);

-                return;

-            }

-

 #if HOOK_ORDER_ASSERTS

             // The order of this hook between SetCameraHook() and CalculateCameraHook() is inconsistent.

             debugLog($"SetCameraTentHook(0x{unknownPtr:X}) @ {frameTick}");

@@ -1642,12 +1603,6 @@ namespace NewCamera
 

         private void SetCameraCutsceneHook(nint unknownPtr)

         {

-            if (disableMod)

-            {

-                setCameraCutsceneHook!.Original(unknownPtr);

-                return;

-            }

-

 #if HOOK_ORDER_ASSERTS

             debugLog($"SetCameraCutsceneHook(0x{unknownPtr:X}) @ {frameTick}");

 #endif

@@ -1671,11 +1626,6 @@ namespace NewCamera
         {

             calculateViewHook!.Original(unknownPtr);

 

-            if (disableMod)

-            {

-                return;

-            }

-

             if (vCameraViewportIndex >= 0 && cameraRoll != 0.0f)

             {

                 Viewport vp = CameraSystem.GetViewport(vCameraViewportIndex);

@@ -1717,22 +1667,18 @@ namespace NewCamera
         // This can undoubtedly be simplified.

         private void WritePadInputHook(nint unknownPtr, nint unknownPtr2, nint unknownPtr3)

         {

-            // Assume the primary pad always comes first.

-            if (primaryPad == 0x0)

-            {

-                primaryPad = unknownPtr2;

-            }

+#if HOOK_ORDER_ASSERTS

+            debugLog($"WritePadInputHook(0x{unknownPtr:X}, 0x{unknownPtr2:X}, 0x{unknownPtr3:X}) @ {frameTick}");

+#endif

 

-            if (disableMod || unknownPtr2 != primaryPad)

+            // Assume the primary pad always comes first.

+            if (primaryPad == 0x0) primaryPad = unknownPtr2;

+            if (unknownPtr2 != primaryPad)

             {

                 writePadInputHook!.Original(unknownPtr, unknownPtr2, unknownPtr3);

                 return;

             }

 

-#if HOOK_ORDER_ASSERTS

-            debugLog($"WritePadInputHook(0x{unknownPtr:X}, 0x{unknownPtr2:X}, 0x{unknownPtr3:X}) @ {frameTick}");

-#endif

-

             Button b1 = 0u, b2 = 0u;

             uint b1u = 0u;

             if (enableCombo && freeCameraCombo != null)

@@ -2027,11 +1973,6 @@ namespace NewCamera
 

         private float CheckMovementHook(int stickValue, float alwaysZero)

         {

-            if (disableMod)

-            {

-                return checkMovementHook!.Original(stickValue, alwaysZero);

-            }

-

 #if HOOK_ORDER_ASSERTS

             debugLog($"CheckMovementHook({stickValue:X}, {alwaysZero}) @ {frameTick}");

 #endif

@@ -2057,32 +1998,30 @@ namespace NewCamera
 

         private void UnderwaterCheckHook(nint unknownPtr)

         {

-            underwaterCheckHook!.Original(unknownPtr);

-

-            if (disableMod || !enableUnderwaterCamera)

-            {

-                return;

-            }

-

 #if HOOK_ORDER_ASSERTS

             debugLog($"UnderwaterCheckHook(0x{unknownPtr:X}) @ {frameTick}");

 #endif

 

-            cameraIsUnderwater = MemoryUtil.Read<byte>(unknownPtr + 0x1E83) == 0x1;

+            underwaterCheckHook!.Original(unknownPtr);

+

+            if (enableUnderwaterCamera)

+            {

+                cameraIsUnderwater = MemoryUtil.Read<byte>(unknownPtr + 0x1E83) == 0x1;

+            }

         }

 

         private void CameraEffectHook(nint unknownPtr, nint unknownPtr2, nint unknownPtr3)

         {

-            if (disableMod || !enableUnderwaterCamera)

+#if HOOK_ORDER_ASSERTS

+            debugLog($"CameraEffectHook(0x{unknownPtr:X}, 0x{unknownPtr2:X}, 0x{unknownPtr3:X}) @ {frameTick}");

+#endif

+

+            if (!enableUnderwaterCamera)

             {

                 cameraEffectHook!.Original(unknownPtr, unknownPtr2, unknownPtr3);

                 return;

             }

 

-#if HOOK_ORDER_ASSERTS

-            debugLog($"CameraEffectHook(0x{unknownPtr:X}, 0x{unknownPtr2:X}, 0x{unknownPtr3:X}) @ {frameTick}");

-#endif

-

             byte[]? underwaterValues = null;

             nint targetAddr = 0x0;