Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 5ff2a24

Browse files
committed
Removed disable multithreaded lua setting. It has different semantics that are tricky to support
1 parent 501b82c commit 5ff2a24

File tree

3 files changed

+0
-14
lines changed

3 files changed

+0
-14
lines changed

Managers/LuaMan.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,6 @@ namespace RTE {
358358
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
359359

360360
bool LuaMan::IsScriptThreadSafe(const std::string &scriptPath) {
361-
if (!g_SettingsMan.GetEnableMultithreadedLua()) {
362-
return false;
363-
}
364-
365361
// First check our cache
366362
auto itr = m_ScriptThreadSafetyMap.find(scriptPath);
367363
if (itr != m_ScriptThreadSafetyMap.end()) {

Managers/SettingsMan.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ namespace RTE {
4444
m_ShowForeignItems = true;
4545
m_ShowMetaScenes = false;
4646

47-
m_EnableMultithreadedLua = true;
4847
m_DisableLuaJIT = false;
4948
m_RecommendedMOIDCount = 512;
5049
m_SimplifiedCollisionDetection = false;
@@ -170,7 +169,6 @@ namespace RTE {
170169
MatchProperty("DisableFactionBuyMenuThemes", { reader >> m_DisableFactionBuyMenuThemes; });
171170
MatchProperty("DisableFactionBuyMenuThemeCursors", { reader >> m_DisableFactionBuyMenuThemeCursors; });
172171
MatchProperty("PathFinderGridNodeSize", { reader >> m_PathFinderGridNodeSize; });
173-
MatchProperty("EnableMultithreadedLua", { reader >> m_EnableMultithreadedLua; });
174172
MatchProperty("AIUpdateInterval", { reader >> m_AIUpdateInterval; });
175173
MatchProperty("EnableParticleSettling", { reader >> g_MovableMan.m_SettlingEnabled; });
176174
MatchProperty("EnableMOSubtraction", { reader >> g_MovableMan.m_MOSubtractionEnabled; });
@@ -310,7 +308,6 @@ namespace RTE {
310308
writer.NewDivider(false);
311309
writer.NewLineString("// Engine Settings", false);
312310
writer.NewLine(false);
313-
writer.NewPropertyWithValue("EnableMultithreadedLua", m_EnableMultithreadedLua);
314311
writer.NewPropertyWithValue("DisableLuaJIT", m_DisableLuaJIT);
315312
writer.NewPropertyWithValue("RecommendedMOIDCount", m_RecommendedMOIDCount);
316313
writer.NewPropertyWithValue("SimplifiedCollisionDetection", m_SimplifiedCollisionDetection);

Managers/SettingsMan.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@ namespace RTE {
123123
/// <returns>Whether or not any experimental settings are used.</returns>
124124
bool GetAnyExperimentalSettingsEnabled() const { return false; }
125125

126-
/// <summary>
127-
/// Returns whether or not multithreaded Lua is enabled.
128-
/// </summary>
129-
/// <returns>Whether or not multithreaded Lua is enabled.</returns>
130-
bool GetEnableMultithreadedLua() const { return m_EnableMultithreadedLua; }
131-
132126
/// <summary>
133127
/// Gets the AI update interval.
134128
/// </summary>
@@ -547,7 +541,6 @@ namespace RTE {
547541
bool m_AllowSavingToBase; //!< Whether editors will allow to select Base.rte as a module to save in.
548542
bool m_ShowMetaScenes; //!< Show MetaScenes in editors and activities.
549543

550-
int m_EnableMultithreadedLua; //!< Whether or not to enable multithreaded Lua scripts.
551544
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.
552545
int m_RecommendedMOIDCount; //!< Recommended max MOID's before removing actors from scenes.
553546
bool m_SimplifiedCollisionDetection; //!< Whether simplified collision detection (reduced MOID layer sampling) is enabled.

0 commit comments

Comments
 (0)