From fdc2e63152ad61674268923cadda2b4442064b1d Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sat, 10 Jan 2026 19:51:35 +0100 Subject: [PATCH 1/4] Save Lua script ids instead of paths --- .../lua/testconfiguration.cpp | 10 ++-- .../lua/testscriptscontainer.cpp | 2 +- apps/openmw/mwlua/luamanagerimp.cpp | 12 +++-- apps/openmw/mwlua/luamanagerimp.hpp | 2 +- components/esm/luascripts.cpp | 15 ++++-- components/esm/luascripts.hpp | 2 +- components/esm3/esmreader.hpp | 10 ++++ components/esm3/formatversion.hpp | 3 +- components/lua/configuration.cpp | 54 ++++++++++++++++++- components/lua/configuration.hpp | 13 ++++- components/lua/scriptscontainer.cpp | 28 ++++------ 11 files changed, 115 insertions(+), 36 deletions(-) diff --git a/apps/components_tests/lua/testconfiguration.cpp b/apps/components_tests/lua/testconfiguration.cpp index 2cde0309d6..eef2cf1fde 100644 --- a/apps/components_tests/lua/testconfiguration.cpp +++ b/apps/components_tests/lua/testconfiguration.cpp @@ -48,7 +48,7 @@ namespace EXPECT_EQ(LuaUtil::scriptCfgToString(cfg.mScripts[5]), "CUSTOM CREATURE : my_mod/creature.lua"); LuaUtil::ScriptsConfiguration conf; - conf.init(std::move(cfg)); + conf.init(std::move(cfg), false); ASSERT_EQ(conf.size(), 4); EXPECT_EQ(LuaUtil::scriptCfgToString(conf[0]), "GLOBAL : my_mod/#some_global_script.lua"); // cfg.mScripts[1] is overridden by cfg.mScripts[4] @@ -68,7 +68,7 @@ namespace // Check that initialization cleans old data cfg = ESM::LuaScriptsCfg(); - conf.init(std::move(cfg)); + conf.init(std::move(cfg), false); EXPECT_EQ(conf.size(), 0); } @@ -82,7 +82,7 @@ namespace cfg.mScripts.clear(); EXPECT_NO_THROW(LuaUtil::parseOMWScripts(cfg, "GLOBAL, PLAYER: something.lua")); LuaUtil::ScriptsConfiguration conf; - EXPECT_ERROR(conf.init(std::move(cfg)), "Global script can not have local flags"); + EXPECT_ERROR(conf.init(std::move(cfg), false), "Global script can not have local flags"); } TEST(LuaConfigurationTest, ConfInit) @@ -112,7 +112,7 @@ namespace script1Extra.mRefs.push_back({ false, 2, 3, "" }); LuaUtil::ScriptsConfiguration conf; - conf.init(cfg); + conf.init(cfg, false); ASSERT_EQ(conf.size(), 2); EXPECT_EQ(LuaUtil::scriptCfgToString(conf[0]), "CUSTOM PLAYER CREATURE NPC : script1.lua ; data 5 bytes ; 3 records ; 4 objects"); @@ -141,7 +141,7 @@ namespace ESM::LuaScriptCfg& script3 = cfg.mScripts.emplace_back(); script3.mScriptPath = VFS::Path::Normalized("script1.lua"); script3.mFlags = ESM::LuaScriptCfg::sGlobal; - EXPECT_ERROR(conf.init(cfg), "Flags mismatch for script1.lua"); + EXPECT_ERROR(conf.init(cfg, false), "Flags mismatch for script1.lua"); } TEST(LuaConfigurationTest, Serialization) diff --git a/apps/components_tests/lua/testscriptscontainer.cpp b/apps/components_tests/lua/testscriptscontainer.cpp index 19c148da2f..0791dfb427 100644 --- a/apps/components_tests/lua/testscriptscontainer.cpp +++ b/apps/components_tests/lua/testscriptscontainer.cpp @@ -225,7 +225,7 @@ CUSTOM, PLAYER: useInterface.lua CUSTOM: unload.lua CUSTOM: customdata.lua )X"); - mCfg.init(std::move(cfg)); + mCfg.init(std::move(cfg), false); } int getId(VFS::Path::NormalizedView path) const diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp index 520f09cad0..2696af9ba4 100644 --- a/apps/openmw/mwlua/luamanagerimp.cpp +++ b/apps/openmw/mwlua/luamanagerimp.cpp @@ -86,9 +86,9 @@ namespace MWLua LuaUi::clearSettings(); } - void LuaManager::initConfiguration() + void LuaManager::initConfiguration(bool reload) { - mConfiguration.init(MWBase::Environment::get().getESMStore()->getLuaScriptsCfg()); + mConfiguration.init(MWBase::Environment::get().getESMStore()->getLuaScriptsCfg(), reload); Log(Debug::Verbose) << "Lua scripts configuration (" << mConfiguration.size() << " scripts):"; for (size_t i = 0; i < mConfiguration.size(); ++i) Log(Debug::Verbose) << "#" << i << " " << LuaUtil::scriptCfgToString(mConfiguration[i]); @@ -137,7 +137,7 @@ namespace MWLua mPlayerStorage.setActive(true); mGlobalStorage.setActive(false); - initConfiguration(); + initConfiguration(false); mInitialized = true; mMenuScripts.addAutoStartedScripts(); }); @@ -661,6 +661,7 @@ namespace MWLua writer.writeHNT("LUAW", MWBase::Environment::get().getWorld()->getTimeManager()->getSimulationTime()); writer.writeFormId(MWBase::Environment::get().getWorldModel()->getLastGeneratedRefNum(), true); + mConfiguration.write(writer); ESM::LuaScripts globalScripts; mGlobalScripts.save(globalScripts); globalScripts.save(writer); @@ -682,6 +683,8 @@ namespace MWLua throw std::runtime_error("Last generated RefNum is invalid"); MWBase::Environment::get().getWorldModel()->setLastGeneratedRefNum(lastGenerated); + mConfiguration.read(reader); + // TODO: don't execute scripts right away, it will be necessary in multiplayer where global storage requires // initialization. For now just set global storage as active slightly before it would be set by gameLoaded() mGlobalStorage.setActive(true); @@ -735,7 +738,6 @@ namespace MWLua mLua.dropScriptCache(); mInputActions.clear(true); mInputTriggers.clear(true); - initConfiguration(); ESM::LuaScripts globalData; @@ -759,6 +761,8 @@ namespace MWLua localData[id] = std::move(data); } + initConfiguration(true); + mMenuScripts.removeAllScripts(); mPlayerStorage.clearTemporaryAndRemoveCallbacks(); diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp index 80c3163c80..1e286f0609 100644 --- a/apps/openmw/mwlua/luamanagerimp.hpp +++ b/apps/openmw/mwlua/luamanagerimp.hpp @@ -177,7 +177,7 @@ namespace MWLua bool isSynchronizedUpdateRunning() const { return mRunningSynchronizedUpdates; } private: - void initConfiguration(); + void initConfiguration(bool reload); LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr, std::optional autoStartConf = std::nullopt); void reloadAllScriptsImpl(); diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp index f724331548..e6d318a9e0 100644 --- a/components/esm/luascripts.cpp +++ b/components/esm/luascripts.cpp @@ -3,6 +3,7 @@ #include #include +#include #include #include @@ -164,7 +165,15 @@ void ESM::LuaScripts::load(ESMReader& esm) { while (esm.isNextSub("LUAS")) { - VFS::Path::Normalized name(esm.getHString()); + int32_t id = -1; + if (esm.getFormatVersion() <= ESM::MaxLuaScriptPathFormatVersion) + { + VFS::Path::Normalized name(esm.getHString()); + if (const LuaUtil::ScriptsConfiguration* config = esm.getScriptsConfiguration()) + id = config->findId(name).value_or(-1); + } + else + esm.getHT(id); std::string data = loadLuaBinaryData(esm); std::vector timers; while (esm.isNextSub("LUAT")) @@ -177,7 +186,7 @@ void ESM::LuaScripts::load(ESMReader& esm) timer.mCallbackArgument = loadLuaBinaryData(esm); timers.push_back(std::move(timer)); } - mScripts.push_back({ std::move(name), std::move(data), std::move(timers) }); + mScripts.push_back({ id, std::move(data), std::move(timers) }); } } @@ -185,7 +194,7 @@ void ESM::LuaScripts::save(ESMWriter& esm) const { for (const LuaScript& script : mScripts) { - esm.writeHNString("LUAS", script.mScriptPath); + esm.writeHNT("LUAS", script.mScriptId); saveLuaBinaryData(esm, script.mData); for (const LuaTimer& timer : script.mTimers) { diff --git a/components/esm/luascripts.hpp b/components/esm/luascripts.hpp index 705e3f106c..e117fea05d 100644 --- a/components/esm/luascripts.hpp +++ b/components/esm/luascripts.hpp @@ -87,7 +87,7 @@ namespace ESM struct LuaScript { - VFS::Path::Normalized mScriptPath; + int32_t mScriptId; std::string mData; // Serialized Lua table. It is a binary data. Can contain '\0'. std::vector mTimers; }; diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp index 938275c69e..788a721ba2 100644 --- a/components/esm3/esmreader.hpp +++ b/components/esm3/esmreader.hpp @@ -18,6 +18,11 @@ #include "loadtes3.hpp" +namespace LuaUtil +{ + class ScriptsConfiguration; +} + namespace ESM { template @@ -126,6 +131,9 @@ namespace ESM void setActorIdConverter(ActorIdConverter* converter) { mActorIdConverter = converter; } ActorIdConverter* getActorIdConverter() const { return mActorIdConverter; } + void setScriptsConfiguration(const LuaUtil::ScriptsConfiguration* config) { mScriptsConfiguration = config; } + const LuaUtil::ScriptsConfiguration* getScriptsConfiguration() const { return mScriptsConfiguration; } + /************************************************************************* * * Medium-level reading shortcuts @@ -391,6 +399,8 @@ namespace ESM const std::map* mContentFileMapping = nullptr; ActorIdConverter* mActorIdConverter = nullptr; + + const LuaUtil::ScriptsConfiguration* mScriptsConfiguration = nullptr; }; } #endif diff --git a/components/esm3/formatversion.hpp b/components/esm3/formatversion.hpp index 6e65217e11..c94c90e49a 100644 --- a/components/esm3/formatversion.hpp +++ b/components/esm3/formatversion.hpp @@ -30,7 +30,8 @@ namespace ESM inline constexpr FormatVersion MaxPlayerBeforeCellDataFormatVersion = 32; inline constexpr FormatVersion MaxActorIdSaveGameFormatVersion = 34; inline constexpr FormatVersion MaxSerializeEffectRefIdFormatVersion = 35; - inline constexpr FormatVersion CurrentSaveGameFormatVersion = 36; + inline constexpr FormatVersion MaxLuaScriptPathFormatVersion = 36; + inline constexpr FormatVersion CurrentSaveGameFormatVersion = 37; inline constexpr FormatVersion MinSupportedSaveGameFormatVersion = 5; inline constexpr FormatVersion OpenMW0_49MinSaveGameFormatVersion = 5; diff --git a/components/lua/configuration.cpp b/components/lua/configuration.cpp index 5e3cdfe805..3aa4f2506b 100644 --- a/components/lua/configuration.cpp +++ b/components/lua/configuration.cpp @@ -6,6 +6,8 @@ #include #include +#include +#include #include #include @@ -47,8 +49,14 @@ namespace LuaUtil } } - void ScriptsConfiguration::init(ESM::LuaScriptsCfg cfg) + void ScriptsConfiguration::init(ESM::LuaScriptsCfg cfg, bool remap) { + std::vector oldPaths; + if (remap) + { + for (ESM::LuaScriptCfg& script : mScripts) + oldPaths.emplace_back(std::move(script.mScriptPath)); + } mScripts.clear(); mPathToIndex.clear(); @@ -112,6 +120,16 @@ namespace LuaUtil DetailedConf{ i, r.mAttach, data }); } } + + if (remap) + { + mScriptIdMapping.clear(); + for (size_t i = 0; i < oldPaths.size(); ++i) + { + if (std::optional id = findId(oldPaths[i])) + mScriptIdMapping[static_cast(i)] = *id; + } + } } std::optional ScriptsConfiguration::findId(VFS::Path::NormalizedView path) const @@ -169,6 +187,40 @@ namespace LuaUtil return res; } + void ScriptsConfiguration::read(ESM::ESMReader& reader) + { + reader.setScriptsConfiguration(this); + mScriptIdMapping.clear(); + int index = 0; + while (reader.isNextSub("LUAP")) + { + VFS::Path::Normalized path(reader.getHString()); + if (std::optional id = findId(path)) + mScriptIdMapping[index] = *id; + ++index; + } + } + + void ScriptsConfiguration::write(ESM::ESMWriter& writer) const + { + for (const ESM::LuaScriptCfg& script : mScripts) + writer.writeHNString("LUAP", script.mScriptPath); + } + + std::optional ScriptsConfiguration::mapId(int savedId) const + { + if (mScriptIdMapping.empty()) + { + if (savedId == -1) + return {}; + return savedId; + } + auto it = mScriptIdMapping.find(savedId); + if (it == mScriptIdMapping.end()) + return {}; + return it->second; + } + void parseOMWScripts(ESM::LuaScriptsCfg& cfg, std::string_view data) { while (!data.empty()) diff --git a/components/lua/configuration.hpp b/components/lua/configuration.hpp index caa8f27c6f..d14e584be4 100644 --- a/components/lua/configuration.hpp +++ b/components/lua/configuration.hpp @@ -8,6 +8,12 @@ #include #include +namespace ESM +{ + class ESMReader; + class ESMWriter; +} + namespace LuaUtil { using ScriptIdsWithInitializationData = std::map; @@ -15,12 +21,13 @@ namespace LuaUtil class ScriptsConfiguration { public: - void init(ESM::LuaScriptsCfg); + void init(ESM::LuaScriptsCfg, bool); size_t size() const { return mScripts.size(); } const ESM::LuaScriptCfg& operator[](size_t id) const { return mScripts[id]; } std::optional findId(VFS::Path::NormalizedView path) const; + std::optional mapId(int savedId) const; bool isCustomScript(int id) const { return mScripts[id].mFlags & ESM::LuaScriptCfg::sCustom; } @@ -30,6 +37,9 @@ namespace LuaUtil ScriptIdsWithInitializationData getLocalConf( uint32_t type, const ESM::RefId& recordId, ESM::RefNum refnum) const; + void read(ESM::ESMReader&); + void write(ESM::ESMWriter&) const; + private: ScriptIdsWithInitializationData getConfByFlag(ESM::LuaScriptCfg::Flags flag) const; @@ -45,6 +55,7 @@ namespace LuaUtil std::map> mScriptsPerType; std::map, std::less<>> mScriptsPerRecordId; std::map> mScriptsPerRefNum; + std::map mScriptIdMapping; }; // Parse ESM::LuaScriptsCfg from text and add to `cfg`. diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp index 82eaa47ec9..6cc13cc767 100644 --- a/components/lua/scriptscontainer.cpp +++ b/components/lua/scriptscontainer.cpp @@ -205,15 +205,10 @@ namespace LuaUtil using T = std::decay_t; if constexpr (std::is_same_v) { - const auto& conf = mLua.getConfiguration(); - if (scriptId >= 0 && static_cast(scriptId) < conf.size()) + for (const ESM::LuaScript& script : variant.mScripts) { - const auto& path = conf[scriptId].mScriptPath; - for (const ESM::LuaScript& script : variant.mScripts) - { - if (script.mScriptPath == path) - return true; - } + if (script.mScriptId == scriptId) + return true; } return false; } @@ -443,9 +438,7 @@ namespace LuaUtil for (auto& [scriptId, script] : loadedData.mScripts) { ESM::LuaScript savedScript; - // Note: We can not use `scriptPath(scriptId)` here because `save` can be called during - // evaluating "reloadlua" command when ScriptsConfiguration is already changed. - savedScript.mScriptPath = script.mPath; + savedScript.mScriptId = scriptId; if (script.mOnSave) { try @@ -475,10 +468,10 @@ namespace LuaUtil scripts[scriptId] = { initData, nullptr }; for (const ESM::LuaScript& s : data.mScripts) { - std::optional scriptId = cfg.findId(s.mScriptPath); + std::optional scriptId = cfg.mapId(s.mScriptId); if (!scriptId) { - Log(Debug::Verbose) << "Ignoring " << mNamePrefix << "[" << s.mScriptPath << "]; script not registered"; + Log(Debug::Verbose) << "Ignoring " << mNamePrefix << "[" << s.mScriptId << "]; script not registered"; continue; } auto it = scripts.find(*scriptId); @@ -487,7 +480,7 @@ namespace LuaUtil else if (cfg.isCustomScript(*scriptId)) scripts[*scriptId] = { cfg[*scriptId].mInitializationData, &s }; else - Log(Debug::Verbose) << "Ignoring " << mNamePrefix << "[" << s.mScriptPath + Log(Debug::Verbose) << "Ignoring " << mNamePrefix << "[" << cfg[*scriptId].mScriptPath << "]; this script is not allowed here"; } @@ -549,12 +542,11 @@ namespace LuaUtil scripts[scriptId] = { initData, nullptr }; for (const ESM::LuaScript& s : savedScripts) { - std::optional scriptId = cfg.findId(s.mScriptPath); - auto it = scripts.find(*scriptId); + auto it = scripts.find(s.mScriptId); if (it != scripts.end()) it->second.mSavedData = &s; - else if (cfg.isCustomScript(*scriptId)) - scripts[*scriptId] = { cfg[*scriptId].mInitializationData, &s }; + else if (cfg.isCustomScript(s.mScriptId)) + scripts[s.mScriptId] = { cfg[s.mScriptId].mInitializationData, &s }; } mLua.protectedCall([&](LuaView& view) { From ee1cee1181b0835c400451547fc2785c4bdff299 Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sat, 31 Jan 2026 13:21:30 +0100 Subject: [PATCH 2/4] Reassign script id and test script order changes --- .../lua/testscriptscontainer.cpp | 29 +++++++++++++++++++ components/lua/scriptscontainer.cpp | 1 + 2 files changed, 30 insertions(+) diff --git a/apps/components_tests/lua/testscriptscontainer.cpp b/apps/components_tests/lua/testscriptscontainer.cpp index 0791dfb427..34634ef31d 100644 --- a/apps/components_tests/lua/testscriptscontainer.cpp +++ b/apps/components_tests/lua/testscriptscontainer.cpp @@ -650,4 +650,33 @@ CUSTOM: customdata.lua EXPECT_FALSE(true); }); } + + TEST_F(LuaScriptsContainerTest, ScriptOrderChange) + { + LuaUtil::ScriptsContainer scripts1(&mLua, "Test"); + scripts1.setAutoStartConf(mCfg.getLocalConf(ESM::REC_NPC_, ESM::RefId(), ESM::RefNum())); + scripts1.addAutoStartedScripts(); + const int scriptId = getId(test1Path); + EXPECT_TRUE(scripts1.addCustomScript(scriptId)); + + ESM::LuaScripts data; + scripts1.save(data); + + ESM::LuaScriptsCfg cfg; + LuaUtil::parseOMWScripts(cfg, R"X( +CUSTOM, NPC: loadSave2.lua +NPC: loadSave1.lua +CUSTOM: test1.lua +)X"); + mCfg.init(std::move(cfg), true); + + LuaUtil::ScriptsContainer scripts2(&mLua, "Test"); + scripts2.setAutoStartConf(mCfg.getLocalConf(ESM::REC_NPC_, ESM::RefId(), ESM::RefNum())); + scripts2.load(data); + + const int newScriptId = getId(test1Path); + EXPECT_NE(scriptId, newScriptId); + EXPECT_EQ(newScriptId, 2); + EXPECT_TRUE(scripts2.hasScript(newScriptId)); + } } diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp index 6cc13cc767..481924d194 100644 --- a/components/lua/scriptscontainer.cpp +++ b/components/lua/scriptscontainer.cpp @@ -492,6 +492,7 @@ namespace LuaUtil if (scriptInfo.mSavedData == nullptr) continue; ESM::LuaScript& script = container.mScripts.emplace_back(*scriptInfo.mSavedData); + script.mScriptId = scriptId; if (!script.mData.empty()) { try From f93aca81666f289ef674f18bc7744ee68c74d524 Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sun, 1 Feb 2026 20:04:36 +0100 Subject: [PATCH 3/4] Clear script index caches when (re)loading config --- components/lua/configuration.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/lua/configuration.cpp b/components/lua/configuration.cpp index 3aa4f2506b..3349ca616d 100644 --- a/components/lua/configuration.cpp +++ b/components/lua/configuration.cpp @@ -102,6 +102,9 @@ namespace LuaUtil // Initialize mappings mPathToIndex.clear(); + mScriptsPerType.clear(); + mScriptsPerRecordId.clear(); + mScriptsPerRefNum.clear(); for (int i = 0; i < static_cast(mScripts.size()); ++i) { const ESM::LuaScriptCfg& s = mScripts[i]; From e4ffddb641467a2e699978c9767397642b00cff5 Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sun, 8 Feb 2026 10:35:22 +0100 Subject: [PATCH 4/4] Replace getters and setters with direct member access --- apps/openmw/mwstate/statemanagerimp.cpp | 2 +- apps/openmw/mwworld/cellstore.cpp | 4 ++-- apps/openmw/mwworld/player.cpp | 5 +++-- apps/openmw/mwworld/projectilemanager.cpp | 6 +++--- components/esm/luascripts.cpp | 4 ++-- components/esm3/activespells.cpp | 2 +- components/esm3/aisequence.cpp | 2 +- components/esm3/esmreader.hpp | 9 +-------- components/esm3/objectstate.cpp | 2 +- components/lua/configuration.cpp | 2 +- 10 files changed, 16 insertions(+), 22 deletions(-) diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp index 97a516f635..75dac887da 100644 --- a/apps/openmw/mwstate/statemanagerimp.cpp +++ b/apps/openmw/mwstate/statemanagerimp.cpp @@ -471,7 +471,7 @@ void MWState::StateManager::loadGame(const Character* character, const std::file ESM::ActorIdConverter actorIdConverter; if (version <= ESM::MaxActorIdSaveGameFormatVersion) - reader.setActorIdConverter(&actorIdConverter); + reader.mActorIdConverter = &actorIdConverter; Loading::Listener& listener = *MWBase::Environment::get().getWindowManager()->getLoadingScreen(); diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp index d2c7b4af97..83bfaaad1e 100644 --- a/apps/openmw/mwworld/cellstore.cpp +++ b/apps/openmw/mwworld/cellstore.cpp @@ -259,10 +259,10 @@ namespace } if constexpr (std::is_same_v || std::is_same_v) { - if (reader.getActorIdConverter() && state.mHasCustomState) + if (reader.mActorIdConverter && state.mHasCustomState) { MWBase::Environment::get().getWorldModel()->assignSaveFileRefNum(state.mRef); - reader.getActorIdConverter()->mMappings.emplace(state.mCreatureStats.mActorId, state.mRef.mRefNum); + reader.mActorIdConverter->mMappings.emplace(state.mCreatureStats.mActorId, state.mRef.mRefNum); } } diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp index 7fa88b5784..5a6f20e2e7 100644 --- a/apps/openmw/mwworld/player.cpp +++ b/apps/openmw/mwworld/player.cpp @@ -345,8 +345,9 @@ namespace MWWorld MWBase::Environment::get().getWorldModel()->deregisterLiveCellRef(mPlayer); mPlayer.load(player.mObject); MWBase::Environment::get().getWorldModel()->registerPtr(getPlayer()); - if (ESM::ActorIdConverter* converter = reader.getActorIdConverter()) - converter->mMappings.emplace(player.mObject.mCreatureStats.mActorId, mPlayer.mRef.getRefNum()); + if (reader.mActorIdConverter) + reader.mActorIdConverter->mMappings.emplace( + player.mObject.mCreatureStats.mActorId, mPlayer.mRef.getRefNum()); for (size_t i = 0; i < mSaveAttributes.size(); ++i) mSaveAttributes[i] = player.mSaveAttributes[i]; diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp index c79c265e38..6c0999b515 100644 --- a/apps/openmw/mwworld/projectilemanager.cpp +++ b/apps/openmw/mwworld/projectilemanager.cpp @@ -802,12 +802,12 @@ namespace MWWorld void ProjectileManager::saveLoaded(const ESM::ESMReader& reader) { // Can't do this in readRecord because the vectors might get reallocated as they grow - if (reader.getActorIdConverter()) + if (reader.mActorIdConverter) { for (ProjectileState& projectile : mProjectiles) - reader.getActorIdConverter()->convert(projectile.mCaster, projectile.mCaster.mIndex); + reader.mActorIdConverter->convert(projectile.mCaster, projectile.mCaster.mIndex); for (MagicBoltState& bolt : mMagicBolts) - reader.getActorIdConverter()->convert(bolt.mCaster, bolt.mCaster.mIndex); + reader.mActorIdConverter->convert(bolt.mCaster, bolt.mCaster.mIndex); } } diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp index e6d318a9e0..91222c86a5 100644 --- a/components/esm/luascripts.cpp +++ b/components/esm/luascripts.cpp @@ -169,8 +169,8 @@ void ESM::LuaScripts::load(ESMReader& esm) if (esm.getFormatVersion() <= ESM::MaxLuaScriptPathFormatVersion) { VFS::Path::Normalized name(esm.getHString()); - if (const LuaUtil::ScriptsConfiguration* config = esm.getScriptsConfiguration()) - id = config->findId(name).value_or(-1); + if (esm.mScriptsConfiguration) + id = esm.mScriptsConfiguration->findId(name).value_or(-1); } else esm.getHT(id); diff --git a/components/esm3/activespells.cpp b/components/esm3/activespells.cpp index 740ab79acf..5d63971ce7 100644 --- a/components/esm3/activespells.cpp +++ b/components/esm3/activespells.cpp @@ -236,7 +236,7 @@ namespace ESM void ActiveSpells::load(ESMReader& esm) { - mActorIdConverter = esm.getActorIdConverter(); + mActorIdConverter = esm.mActorIdConverter; loadImpl(esm, mSpells, "ID__"); loadImpl(esm, mQueue, "QID_"); } diff --git a/components/esm3/aisequence.cpp b/components/esm3/aisequence.cpp index 0ecba5f7cc..e448582bad 100644 --- a/components/esm3/aisequence.cpp +++ b/components/esm3/aisequence.cpp @@ -230,7 +230,7 @@ namespace ESM void AiSequence::load(ESMReader& esm) { - mActorIdConverter = esm.getActorIdConverter(); + mActorIdConverter = esm.mActorIdConverter; int count = 0; while (esm.isNextSub("AIPK")) { diff --git a/components/esm3/esmreader.hpp b/components/esm3/esmreader.hpp index 788a721ba2..d128ac1cd6 100644 --- a/components/esm3/esmreader.hpp +++ b/components/esm3/esmreader.hpp @@ -128,12 +128,6 @@ namespace ESM // Returns false if content file not found. bool applyContentFileMapping(FormId& id); - void setActorIdConverter(ActorIdConverter* converter) { mActorIdConverter = converter; } - ActorIdConverter* getActorIdConverter() const { return mActorIdConverter; } - - void setScriptsConfiguration(const LuaUtil::ScriptsConfiguration* config) { mScriptsConfiguration = config; } - const LuaUtil::ScriptsConfiguration* getScriptsConfiguration() const { return mScriptsConfiguration; } - /************************************************************************* * * Medium-level reading shortcuts @@ -385,8 +379,6 @@ namespace ESM uint32_t mRecordFlags; - // Special file signifier (see SpecialFile enum above) - // Buffer for ESM strings std::vector mBuffer; @@ -398,6 +390,7 @@ namespace ESM const std::map* mContentFileMapping = nullptr; + public: ActorIdConverter* mActorIdConverter = nullptr; const LuaUtil::ScriptsConfiguration* mScriptsConfiguration = nullptr; diff --git a/components/esm3/objectstate.cpp b/components/esm3/objectstate.cpp index 6f83e6a648..b0c2381511 100644 --- a/components/esm3/objectstate.cpp +++ b/components/esm3/objectstate.cpp @@ -14,7 +14,7 @@ namespace ESM void ObjectState::load(ESMReader& esm) { mVersion = esm.getFormatVersion(); - mActorIdConverter = esm.getActorIdConverter(); + mActorIdConverter = esm.mActorIdConverter; bool isDeleted; mRef.loadData(esm, isDeleted); diff --git a/components/lua/configuration.cpp b/components/lua/configuration.cpp index 3349ca616d..a229d6f1c9 100644 --- a/components/lua/configuration.cpp +++ b/components/lua/configuration.cpp @@ -192,7 +192,7 @@ namespace LuaUtil void ScriptsConfiguration::read(ESM::ESMReader& reader) { - reader.setScriptsConfiguration(this); + reader.mScriptsConfiguration = this; mScriptIdMapping.clear(); int index = 0; while (reader.isNextSub("LUAP"))