mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-02-11 00:38:26 +00:00
Code Issues Releases Wiki Activity

Replace getters and setters with direct member access

Browse source
This commit is contained in:
Evil Eye 2026-02-08 10:35:22 +01:00
parent f93aca8166
commit e4ffddb641
10 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwstate/statemanagerimp.cpp
View file

@ -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();

4
apps/openmw/mwworld/cellstore.cpp
View file

@ -259,10 +259,10 @@ namespace
}
if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
{
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);
}
}

5
apps/openmw/mwworld/player.cpp
View file

@ -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];

6
apps/openmw/mwworld/projectilemanager.cpp
View file

@ -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);
}
}

4
components/esm/luascripts.cpp
View file

@ -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);

2
components/esm3/activespells.cpp
View file

@ -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_");
}

2
components/esm3/aisequence.cpp
View file

@ -230,7 +230,7 @@ namespace ESM
void AiSequence::load(ESMReader& esm)
{
mActorIdConverter = esm.getActorIdConverter();
mActorIdConverter = esm.mActorIdConverter;
int count = 0;
while (esm.isNextSub("AIPK"))
{

9
components/esm3/esmreader.hpp
View file

@ -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<char> mBuffer;
@ -398,6 +390,7 @@ namespace ESM
const std::map<int, int>* mContentFileMapping = nullptr;
public:
ActorIdConverter* mActorIdConverter = nullptr;
const LuaUtil::ScriptsConfiguration* mScriptsConfiguration = nullptr;

2
components/esm3/objectstate.cpp
View file

@ -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);

2
components/lua/configuration.cpp
View file

@ -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"))