From efe79b34954a393346f853c5bb77756286fcccae Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Mon, 21 Sep 2026 14:10:55 -0400
Subject: Cleanup debugLog/frameTick

Signed-off-by: Andrew Opalach <andrew@akon.city>
---
 Plugin.cs | 56 ++++++++++++++++++++++----------------------------------
 1 file changed, 22 insertions(+), 34 deletions(-)

(limited to 'Plugin.cs')

diff --git a/Plugin.cs b/Plugin.cs
index 4bf07e3..ae13e55 100755
--- a/Plugin.cs
+++ b/Plugin.cs
@@ -391,16 +391,15 @@ namespace NewCamera
         private string typedPositionName = "";
         private string selectedPositionName = "";
 
+        public static int updateTick = 0;
+
 #if HOOK_ORDER_ASSERTS
         private int hookOrder = 0;
-        private int frameTick = 0;
 #endif
 
-        private void debugLog(string message)
+        public static void debugLog(string message)
         {
 #if LOG_DEBUG_MESSAGES
-            Log.Info(message);
-#else
             Log.Debug(message);
 #endif
         }
@@ -790,12 +789,14 @@ namespace NewCamera
 
         public void OnUpdate(float deltaTime)
         {
+            if (updateTick == int.MaxValue) updateTick = 0;
+            else updateTick++;
+
+            debugLog($"OnUpdate() @ {updateTick}");
+
 #if HOOK_ORDER_ASSERTS
             Assert(hookOrder == 0 || hookOrder == 4);
             hookOrder = 0;
-            if (frameTick == int.MaxValue) frameTick = 0;
-            else frameTick++;
-            debugLog($"OnUpdate() @ {frameTick}");
 #endif
 
 #if MOUSE_AND_KEYBOARD_LAYER
@@ -1419,8 +1420,9 @@ namespace NewCamera
 
         private void SetCameraHook(nint cameraPointer)
         {
+            debugLog($"SetCameraHook(0x{cameraPointer:X}) @ {updateTick}");
+
 #if HOOK_ORDER_ASSERTS
-            debugLog($"SetCameraHook(0x{cameraPointer:X}) @ {frameTick}");
             Assert(hookOrder == 0);
             hookOrder = 1;
 #endif
@@ -1462,8 +1464,9 @@ namespace NewCamera
         // If camera.Move = false, this hook won't run.
         private void CalculateCameraHook(nint cameraPointer)
         {
+            debugLog($"CalculateCameraHook(0x{cameraPointer:X}) @ {updateTick}");
+
 #if HOOK_ORDER_ASSERTS
-            debugLog($"CalculateCameraHook(0x{cameraPointer:X}) @ {frameTick}");
             Assert(hookOrder == 2);
             hookOrder = 3;
 #endif
@@ -1538,8 +1541,9 @@ namespace NewCamera
 
         private void CheckCameraHook(nint cameraPointer)
         {
+            debugLog($"CheckCameraHook(0x{cameraPointer:X}) @ {updateTick}");
+
 #if HOOK_ORDER_ASSERTS
-            debugLog($"CheckCameraHook(0x{cameraPointer:X}) @ {frameTick}");
             Assert(hookOrder == 1);
             hookOrder = 2;
 #endif
@@ -1565,9 +1569,7 @@ namespace NewCamera
 
         private void StartViewModeHook(nint viewModeObject)
         {
-#if HOOK_ORDER_ASSERTS
-            debugLog($"StartViewMode(0x{viewModeObject:X}) @ {frameTick}");
-#endif
+            debugLog($"StartViewMode(0x{viewModeObject:X}) @ {updateTick}");
 
             if (overrideViewMode && vCamera != null)
             {
@@ -1578,10 +1580,8 @@ namespace NewCamera
 
         private void SetCameraTentHook(nint unknownPtr)
         {
-#if HOOK_ORDER_ASSERTS
             // The order of this hook between SetCameraHook() and CalculateCameraHook() is inconsistent.
-            debugLog($"SetCameraTentHook(0x{unknownPtr:X}) @ {frameTick}");
-#endif
+            debugLog($"SetCameraTentHook(0x{unknownPtr:X}) @ {updateTick}");
 
             if (freeCamera && vCamera != null)
             {
@@ -1603,9 +1603,7 @@ namespace NewCamera
 
         private void SetCameraCutsceneHook(nint unknownPtr)
         {
-#if HOOK_ORDER_ASSERTS
-            debugLog($"SetCameraCutsceneHook(0x{unknownPtr:X}) @ {frameTick}");
-#endif
+            debugLog($"SetCameraCutsceneHook(0x{unknownPtr:X}) @ {updateTick}");
 
             setCameraCutsceneHook!.Original(unknownPtr);
 
@@ -1667,9 +1665,7 @@ namespace NewCamera
         // This can undoubtedly be simplified.
         private void WritePadInputHook(nint unknownPtr, nint unknownPtr2, nint unknownPtr3)
         {
-#if HOOK_ORDER_ASSERTS
-            debugLog($"WritePadInputHook(0x{unknownPtr:X}, 0x{unknownPtr2:X}, 0x{unknownPtr3:X}) @ {frameTick}");
-#endif
+            debugLog($"WritePadInputHook(0x{unknownPtr:X}, 0x{unknownPtr2:X}, 0x{unknownPtr3:X}) @ {updateTick}");
 
             // Assume the primary pad always comes first.
             if (primaryPad == 0x0) primaryPad = unknownPtr2;
@@ -1973,9 +1969,7 @@ namespace NewCamera
 
         private float CheckMovementHook(int stickValue, float alwaysZero)
         {
-#if HOOK_ORDER_ASSERTS
-            debugLog($"CheckMovementHook({stickValue:X}, {alwaysZero}) @ {frameTick}");
-#endif
+            debugLog($"CheckMovementHook({stickValue:X}, {alwaysZero}) @ {updateTick}");
 
             if (freeCamera)
             {
@@ -1998,9 +1992,7 @@ namespace NewCamera
 
         private void UnderwaterCheckHook(nint unknownPtr)
         {
-#if HOOK_ORDER_ASSERTS
-            debugLog($"UnderwaterCheckHook(0x{unknownPtr:X}) @ {frameTick}");
-#endif
+            debugLog($"UnderwaterCheckHook(0x{unknownPtr:X}) @ {updateTick}");
 
             underwaterCheckHook!.Original(unknownPtr);
 
@@ -2012,9 +2004,7 @@ namespace NewCamera
 
         private void CameraEffectHook(nint unknownPtr, nint unknownPtr2, nint unknownPtr3)
         {
-#if HOOK_ORDER_ASSERTS
-            debugLog($"CameraEffectHook(0x{unknownPtr:X}, 0x{unknownPtr2:X}, 0x{unknownPtr3:X}) @ {frameTick}");
-#endif
+            debugLog($"CameraEffectHook(0x{unknownPtr:X}, 0x{unknownPtr2:X}, 0x{unknownPtr3:X}) @ {updateTick}");
 
             if (!enableUnderwaterCamera)
             {
@@ -2405,9 +2395,7 @@ namespace NewCamera
 
         public void OnImGuiRender()
         {
-#if HOOK_ORDER_ASSERTS
-            debugLog($"OnImGuiRender() @ {frameTick}");
-#endif
+            debugLog($"OnImGuiRender() @ {updateTick}");
 
             float width = ImGui.GetWindowWidth();
             width /= width / 600.0f;
-- 
cgit v1.2.3-101-g0448