mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 18:29:55 +00:00
Code Issues Releases Wiki Activity

fixed Clang and whitespace difference with master

Browse source
This commit is contained in:
florent.teppe 2022-09-10 22:58:15 +02:00
parent 10de4a5156
commit 9a19bb84a4
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,6 @@
#include <components/esm3/loadbody.hpp> #include <components/esm3/loadbody.hpp>
#include <components/esm3/loadench.hpp> #include <components/esm3/loadench.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/luamanager.hpp" #include "../mwbase/luamanager.hpp"
#include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/mechanicsmanager.hpp"
@ -152,7 +151,7 @@ namespace
// Deleted reference that did not come from a content file -> ignore // Deleted reference that did not come from a content file -> ignore
continue; continue;
} }
using StateType = RecordToState<T>::StateType; using StateType = typename RecordToState<T>::StateType;
StateType state; StateType state;
iter->save (state); iter->save (state);
@ -209,7 +208,7 @@ namespace
{ {
const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore(); const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
using StateType = RecordToState<T>::StateType; using StateType = typename RecordToState<T>::StateType;
StateType state; StateType state;
state.mRef = cref; state.mRef = cref;
state.load(reader); state.load(reader);
@ -245,7 +244,7 @@ namespace
} }
else if(state.mVersion < 20) else if(state.mVersion < 20)
{ {
if constexpr (std::is_same_v<T, ESM::Creature>|| std::is_same_v<T, ESM::NPC>) if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
MWWorld::convertStats(state.mCreatureStats); MWWorld::convertStats(state.mCreatureStats);
} }