diff --git a/Patch/Engine/RenderEnvironmentPatches.cs b/Patch/Engine/RenderEnvironmentPatches.cs index de9cdd6..df36c62 100644 --- a/Patch/Engine/RenderEnvironmentPatches.cs +++ b/Patch/Engine/RenderEnvironmentPatches.cs @@ -17,7 +17,7 @@ namespace ADOFAIRenderer.Patch.Engine [SuppressMessage("ReSharper", "InconsistentNaming")] public static bool Prefix(ref float __result) { - if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true; + if (!RenderManager.IsCapturingActive || !RenderPatch) return true; __result = (float)(TimeSpent + RenderManager.Instance.timeBase); return false; } @@ -29,7 +29,7 @@ namespace ADOFAIRenderer.Patch.Engine [SuppressMessage("ReSharper", "InconsistentNaming")] public static bool Prefix(ref double __result) { - if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true; + if (!RenderManager.IsCapturingActive || !RenderPatch) return true; __result = TimeSpent + RenderManager.Instance.timeBase; return false; } @@ -41,7 +41,7 @@ namespace ADOFAIRenderer.Patch.Engine [SuppressMessage("ReSharper", "InconsistentNaming")] public static bool Prefix(ref float __result) { - if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true; + if (!RenderManager.IsCapturingActive || !RenderPatch) return true; __result = (float)(TimeSpent + RenderManager.Instance.unscaledTimeBase); return false; } @@ -53,7 +53,7 @@ namespace ADOFAIRenderer.Patch.Engine [SuppressMessage("ReSharper", "InconsistentNaming")] public static bool Prefix(ref double __result) { - if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true; + if (!RenderManager.IsCapturingActive || !RenderPatch) return true; __result = TimeSpent + RenderManager.Instance.unscaledTimeBase; return false; } @@ -65,7 +65,7 @@ namespace ADOFAIRenderer.Patch.Engine [SuppressMessage("ReSharper", "InconsistentNaming")] public static bool Prefix(ref double __result) { - if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true; + if (!RenderManager.IsCapturingActive || !RenderPatch) return true; __result = TimeSpent + RenderManager.Instance.dspTimeBase; return false; } @@ -87,7 +87,7 @@ namespace ADOFAIRenderer.Patch.Engine [SuppressMessage("ReSharper", "InconsistentNaming")] public static bool Prefix(ref int __result) { - if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true; + if (!RenderManager.IsCapturingActive || !RenderPatch) return true; __result = (int)(RenderManager.Instance.frameCount + RenderManager.Instance.frameCountBase); return false; } @@ -99,8 +99,8 @@ namespace ADOFAIRenderer.Patch.Engine [SuppressMessage("ReSharper", "InconsistentNaming")] public static bool Prefix(ref float __result) { - if (RenderManager.Instance && (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance)) return true; - __result = (float)(1 / RenderManager.Instance!.Configuration.RenderFPS); + if (!RenderManager.IsCapturingActive || !RenderPatch) return true; + __result = (float)(1 / RenderManager.Instance.Configuration.RenderFPS); return false; } } @@ -111,7 +111,7 @@ namespace ADOFAIRenderer.Patch.Engine [SuppressMessage("ReSharper", "InconsistentNaming")] public static bool Prefix(ref float __result) { - if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true; + if (!RenderManager.IsCapturingActive || !RenderPatch) return true; __result = (float)(1 / RenderManager.Instance.Configuration.RenderFPS); return false; } diff --git a/Patch/Game/EndscreenLanternsPatch.cs b/Patch/Game/EndscreenLanternsPatch.cs index bc72b8a..acf6da2 100644 --- a/Patch/Game/EndscreenLanternsPatch.cs +++ b/Patch/Game/EndscreenLanternsPatch.cs @@ -28,6 +28,7 @@ namespace ADOFAIRenderer.Patch.Game public static void PrefixHide(EndscreenLanterns __instance) { if (__instance == null) return; + if (!RenderManager.IsActive) return; var traverse = Traverse.Create(__instance);