diff options
Diffstat (limited to 'Player.cs')
| -rw-r--r-- | Player.cs | 33 |
1 files changed, 13 insertions, 20 deletions
@@ -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; |