Implemented automatic debugger connection and setup when EnableLuaDebugging = 1 in config

Allowed objects in master script state to work properly and fully even with multithreaded instructions (by running them in the same manner but singlethreaded)

Author: Causeless

Source/Entities/MovableObject.cpp

@@ -85,7 +85,7 @@ void MovableObject::Clear() {
 	m_NumberValueMap.clear();
 	m_ObjectValueMap.clear();
 	m_ThreadedLuaState = nullptr;
-	m_ForceIntoMasterLuaState = false;
+	m_ForceIntoMasterLuaState = g_SettingsMan.EnableLuaDebugging();
 	m_ScriptObjectName.clear();
 	m_ScreenEffectFile.Reset();
 	m_pScreenEffect = 0;

Source/Managers/LuaMan.cpp

@@ -276,7 +276,7 @@ void LuaStateWrapper::Initialize() {
 	if (g_SettingsMan.EnableLuaDebugging()) {
 		// Enable Lua debugging
 		// Right now we're not requiring the mobdebug module because it doesn't play well with multithreading- we need this to additionally push everything into one Lua state.
-		luaL_dostring(m_State, "require(\"mobdebug\").coro(); --require(\"mobdebug\").start();");
+		luaL_dostring(m_State, "require(\"mobdebug\").coro(); require(\"mobdebug\").start();");
 	}
 }
 
@@ -327,7 +327,9 @@ void LuaMan::Initialize() {
 	m_MasterScriptState.Initialize();
 
 	int luaStateCount = std::thread::hardware_concurrency();
-	if (g_SettingsMan.GetNumberOfLuaStatesOverride() != -1) {
+	if (g_SettingsMan.EnableLuaDebugging()) {
+		luaStateCount = 0;
+	} else if (g_SettingsMan.GetNumberOfLuaStatesOverride() != -1) {
 		luaStateCount = g_SettingsMan.GetNumberOfLuaStatesOverride();
 	}
 

Source/Managers/MovableMan.cpp

@@ -1341,6 +1341,14 @@ void MovableMan::Update() {
 
 		const std::string threadedUpdate = "ThreadedUpdate"; // avoid string reconstruction
 
+		g_LuaMan.SetThreadLuaStateOverride(&g_LuaMan.GetMasterScriptState());
+		for (MovableObject* mo: g_LuaMan.GetMasterScriptState().GetRegisteredMOs()) {
+			if (ValidMO(mo->GetRootParent())) {
+				mo->RunScriptedFunctionInAppropriateScripts(threadedUpdate, false, false, {}, {}, {});
+			}
+		}
+		g_LuaMan.SetThreadLuaStateOverride(nullptr);
+
 		LuaStatesArray& luaStates = g_LuaMan.GetThreadedScriptStates();
 		g_ThreadMan.GetPriorityThreadPool().parallelize_loop(luaStates.size(),
 		                                                     [&](int start, int end) {
@@ -1364,6 +1372,14 @@ void MovableMan::Update() {
 
 		const std::string syncedUpdate = "SyncedUpdate"; // avoid string reconstruction
 
+		g_LuaMan.SetThreadLuaStateOverride(&g_LuaMan.GetMasterScriptState());
+		for (MovableObject* mo: g_LuaMan.GetMasterScriptState().GetRegisteredMOs()) {
+			if (ValidMO(mo->GetRootParent())) {
+				mo->RunScriptedFunctionInAppropriateScripts(syncedUpdate, false, false, {}, {}, {});
+			}
+		}
+		g_LuaMan.SetThreadLuaStateOverride(nullptr);
+
 		for (LuaStateWrapper& luaState: g_LuaMan.GetThreadedScriptStates()) {
 			g_LuaMan.SetThreadLuaStateOverride(&luaState);
 
@@ -1754,6 +1770,14 @@ void MovableMan::UpdateControllers() {
 			actor->GetController()->Update();
 		}
 
+		g_LuaMan.SetThreadLuaStateOverride(&g_LuaMan.GetMasterScriptState());
+		for (Actor* actor: m_Actors) {
+			if (actor->GetLuaState() == &g_LuaMan.GetMasterScriptState() && actor->GetController()->ShouldUpdateAIThisFrame()) {
+				actor->RunScriptedFunctionInAppropriateScripts("ThreadedUpdateAI", false, true, {}, {}, {});
+			}
+		}
+		g_LuaMan.SetThreadLuaStateOverride(nullptr);
+
 		LuaStatesArray& luaStates = g_LuaMan.GetThreadedScriptStates();
 		g_ThreadMan.GetPriorityThreadPool().parallelize_loop(luaStates.size(),
 		                                                     [&](int start, int end) {

Source/Managers/SettingsMan.h

@@ -389,7 +389,7 @@ namespace RTE {
 		bool m_ShowMetaScenes; //!< Show MetaScenes in editors and activities.
 
 		bool m_DisableLuaJIT; //!< Whether to disable LuaJIT or not. Disabling will skip loading the JIT library entirely as just setting 'jit.off()' seems to have no visible effect.
-		bool m_EnableLuaDebugging; //!< Whether the Lua debugger mode is enabled or not. This will disable JITing and will attempt to connect to a debugger on launch.
+		bool m_EnableLuaDebugging; //!< Whether the Lua debugger mode is enabled or not. This will disable MT and attempt to connect to a debugger on launch.
 		int m_RecommendedMOIDCount; //!< Recommended max MOID's before removing actors from scenes.
 		int m_SceneBackgroundAutoScaleMode; //!< Scene background layer auto-scaling mode. 0 for off, 1 for fit screen dimensions and 2 for always upscaled to x2.
 		bool m_DisableFactionBuyMenuThemes; //!< Whether faction BuyMenu theme support is disabled.