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

Commit

Permalink
Removed disable multithreaded lua setting. It has different semantics…
Browse files Browse the repository at this point in the history
… that are tricky to support
  • Loading branch information
Causeless committed Nov 14, 2023
1 parent 501b82c commit 5ff2a24
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 14 deletions.
4 changes: 0 additions & 4 deletions Managers/LuaMan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
3 changes: 0 additions & 3 deletions Managers/SettingsMan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ namespace RTE {
m_ShowForeignItems = true;
m_ShowMetaScenes = false;

m_EnableMultithreadedLua = true;
m_DisableLuaJIT = false;
m_RecommendedMOIDCount = 512;
m_SimplifiedCollisionDetection = false;
Expand Down Expand Up @@ -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; });
Expand Down Expand Up @@ -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);
Expand Down
7 changes: 0 additions & 7 deletions Managers/SettingsMan.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,6 @@ namespace RTE {
/// <returns>Whether or not any experimental settings are used.</returns>
bool GetAnyExperimentalSettingsEnabled() const { return false; }

/// <summary>
/// Returns whether or not multithreaded Lua is enabled.
/// </summary>
/// <returns>Whether or not multithreaded Lua is enabled.</returns>
bool GetEnableMultithreadedLua() const { return m_EnableMultithreadedLua; }

/// <summary>
/// Gets the AI update interval.
/// </summary>
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 5ff2a24

Please sign in to comment.