Fixed Conflict Issue with Debug Mode

NesurChen · Nov 25, 2021 · 845c598 · 845c598
1 parent a2cdb8e
commit 845c598
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 12 deletions.
diff --git a/Bootstrap/Core.cpp b/Bootstrap/Core.cpp
@@ -104,8 +104,7 @@ void Core::Initialize(HINSTANCE hinstDLL)
 		Hook::Attach(&(LPVOID&)Mono::Exports::mono_jit_init_version, Mono::Hooks::mono_jit_init_version);
 	}
 
-	if (!Debug::Enabled)
-		Console::NullHandles();
+	Console::NullHandles();
 }
 
 bool Core::CheckPathASCII() 

diff --git a/Bootstrap/Managers/InternalCalls.cpp b/Bootstrap/Managers/InternalCalls.cpp
@@ -13,12 +13,21 @@
 void InternalCalls::Initialize()
 {
 	Debug::Msg("Initializing Internal Calls...");
+	MelonDebug::AddInternalCalls();
 	MelonLogger::AddInternalCalls();
 	MelonUtils::AddInternalCalls();
 	GameVersionHandler::AddInternalCalls();
 	IIl2CppAssemblyGenerator::AddInternalCalls();
 }
 
+#pragma region MelonDebug
+bool InternalCalls::MelonDebug::IsEnabled() { return Debug::Enabled; }
+void InternalCalls::MelonDebug::AddInternalCalls()
+{
+	Mono::AddInternalCall("MelonLoader.MelonDebug::IsEnabled", IsEnabled);
+}
+#pragma endregion
+
 #pragma region MelonLogger
 void InternalCalls::MelonLogger::Internal_Msg(Console::Color meloncolor, Console::Color txtcolor, Mono::String* namesection, Mono::String* txt)
 {

diff --git a/Bootstrap/Managers/InternalCalls.h b/Bootstrap/Managers/InternalCalls.h
@@ -7,6 +7,13 @@ class InternalCalls
 public:
 	static void Initialize();
 
+	class MelonDebug
+	{
+	public:
+		static void AddInternalCalls();
+		static bool IsEnabled();
+	};
+
 	class MelonLogger
 	{
 	public:

diff --git a/MelonLoader/MelonLaunchOptions.cs b/MelonLoader/MelonLaunchOptions.cs
@@ -6,9 +6,9 @@ public static class MelonLaunchOptions
     {
         internal static void Load()
         {
-#if DEBUG
-            Core.DebugMode = true;
-#endif
+//#if DEBUG
+//            Core.DebugMode = true;
+//#endif
 
             string[] args = Environment.GetCommandLineArgs();
             if ((args == null)
@@ -28,11 +28,11 @@ internal static void Load()
                 switch (arg)
                 {
                     // Core
-#if !DEBUG
-                    case "--melonloader.debug":
-                        Core.DebugMode = true;
-                        goto default;
-#endif
+//#if !DEBUG
+//                    case "--melonloader.debug":
+//                        Core.DebugMode = true;
+//                        goto default;
+//#endif
                     case "--quitfix":
                         Core.QuitFix = true;
                         goto default;
@@ -115,7 +115,7 @@ public enum LoadModeEnum
             }
             public static LoadModeEnum LoadMode_Plugins { get; internal set; }
             public static LoadModeEnum LoadMode_Mods { get; internal set; }
-            public static bool DebugMode { get; internal set; }
+            //public static bool DebugMode { get; internal set; }
             public static bool QuitFix { get; internal set; }
             public static bool StartScreen { get; internal set; } = true;
         }

diff --git a/MelonLoader/Utils/MelonDebug.cs b/MelonLoader/Utils/MelonDebug.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.CompilerServices;
 
 namespace MelonLoader
 {
@@ -36,6 +37,9 @@ public static void Error(string txt)
 
         public static event Action<ConsoleColor, string> MsgCallbackHandler;
         public static event Action<string> ErrorCallbackHandler;
-        public static bool IsEnabled() => MelonLaunchOptions.Core.DebugMode;
+        //public static bool IsEnabled() => MelonLaunchOptions.Core.DebugMode;
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        public extern static bool IsEnabled();
     }
 }
diff --git a/SM_Il2Cpp/Main.cs b/SM_Il2Cpp/Main.cs
@@ -33,6 +33,7 @@ private static ISupportModule_To Initialize(ISupportModule_From interface_from)
 
             ClassInjector.Detour = new UnhollowerDetour();
             InitializeUnityVersion();
+
             ConsoleCleaner();
 
             try
-Original file line number
+Diff line change
@@ Expand Up @@
                 ClassInjector.Detour = new UnhollowerDetour();
                 InitializeUnityVersion();
                 ConsoleCleaner();
                 try
@@ Expand Down @@