diff --git a/Managers/LuaMan.cpp b/Managers/LuaMan.cpp index 560e38cd3..f4af748d3 100644 --- a/Managers/LuaMan.cpp +++ b/Managers/LuaMan.cpp @@ -358,10 +358,6 @@ namespace RTE { ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// bool LuaMan::IsScriptThreadSafe(const std::string &scriptPath) { - if (!g_SettingsMan.GetEnableMultithreadedLua()) { - return false; - } - // First check our cache auto itr = m_ScriptThreadSafetyMap.find(scriptPath); if (itr != m_ScriptThreadSafetyMap.end()) { diff --git a/Managers/SettingsMan.cpp b/Managers/SettingsMan.cpp index ad4d1d920..9d6298944 100644 --- a/Managers/SettingsMan.cpp +++ b/Managers/SettingsMan.cpp @@ -44,7 +44,6 @@ namespace RTE { m_ShowForeignItems = true; m_ShowMetaScenes = false; - m_EnableMultithreadedLua = true; m_DisableLuaJIT = false; m_RecommendedMOIDCount = 512; m_SimplifiedCollisionDetection = false; @@ -170,7 +169,6 @@ namespace RTE { MatchProperty("DisableFactionBuyMenuThemes", { reader >> m_DisableFactionBuyMenuThemes; }); MatchProperty("DisableFactionBuyMenuThemeCursors", { reader >> m_DisableFactionBuyMenuThemeCursors; }); MatchProperty("PathFinderGridNodeSize", { reader >> m_PathFinderGridNodeSize; }); - MatchProperty("EnableMultithreadedLua", { reader >> m_EnableMultithreadedLua; }); MatchProperty("AIUpdateInterval", { reader >> m_AIUpdateInterval; }); MatchProperty("EnableParticleSettling", { reader >> g_MovableMan.m_SettlingEnabled; }); MatchProperty("EnableMOSubtraction", { reader >> g_MovableMan.m_MOSubtractionEnabled; }); @@ -310,7 +308,6 @@ namespace RTE { writer.NewDivider(false); writer.NewLineString("// Engine Settings", false); writer.NewLine(false); - writer.NewPropertyWithValue("EnableMultithreadedLua", m_EnableMultithreadedLua); writer.NewPropertyWithValue("DisableLuaJIT", m_DisableLuaJIT); writer.NewPropertyWithValue("RecommendedMOIDCount", m_RecommendedMOIDCount); writer.NewPropertyWithValue("SimplifiedCollisionDetection", m_SimplifiedCollisionDetection); diff --git a/Managers/SettingsMan.h b/Managers/SettingsMan.h index 5918d52ce..880f6207e 100644 --- a/Managers/SettingsMan.h +++ b/Managers/SettingsMan.h @@ -123,12 +123,6 @@ namespace RTE { /// Whether or not any experimental settings are used. bool GetAnyExperimentalSettingsEnabled() const { return false; } - /// - /// Returns whether or not multithreaded Lua is enabled. - /// - /// Whether or not multithreaded Lua is enabled. - bool GetEnableMultithreadedLua() const { return m_EnableMultithreadedLua; } - /// /// Gets the AI update interval. /// @@ -547,7 +541,6 @@ namespace RTE { bool m_AllowSavingToBase; //!< Whether editors will allow to select Base.rte as a module to save in. bool m_ShowMetaScenes; //!< Show MetaScenes in editors and activities. - int m_EnableMultithreadedLua; //!< Whether or not to enable multithreaded Lua scripts. 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. int m_RecommendedMOIDCount; //!< Recommended max MOID's before removing actors from scenes. bool m_SimplifiedCollisionDetection; //!< Whether simplified collision detection (reduced MOID layer sampling) is enabled.