AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-09 12:25:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Kuyondo 2025-07-28 18:41:07 +08:00
parent f3d23dc57e
commit 1b7b322bac
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwworld/cellstore.cpp
View File

@ -298,6 +298,11 @@ namespace
iter->mData.enable(); iter->mData.enable();
MWBase::Environment::get().getWorld()->disable(ptr); MWBase::Environment::get().getWorld()->disable(ptr);
} }
else
{
if (state.mVersion < ESM::OpenMW0_50SaveGameFormatVersion)
iter->mData.flagAsResolved();
}
MWBase::Environment::get().getWorldModel()->registerPtr(ptr); MWBase::Environment::get().getWorldModel()->registerPtr(ptr);
return; return;
} }

4
apps/openmw/mwworld/refdata.cpp
View File

@ -20,7 +20,7 @@ namespace
// can then be handled by a script. // can then be handled by a script.
Flag_OnActivate = 2, Flag_OnActivate = 2,
Flag_ActivationBuffered = 4, Flag_ActivationBuffered = 4,
Flag_Resolved = 8, Flag_Resolved = 8
}; };
} }
@ -134,7 +134,7 @@ namespace MWWorld
try try
{ {
copy(refData); copy(refData);
mFlags &= ~(Flag_SuppressActivate | Flag_OnActivate | Flag_ActivationBuffered); mFlags &= ~(Flag_SuppressActivate | Flag_OnActivate | Flag_ActivationBuffered | Flag_Resolved);
} }
catch (...) catch (...)
{ {

2
apps/openmw/mwworld/scene.cpp
View File

@ -1134,7 +1134,7 @@ namespace MWWorld
{ {
const VFS::Path::Normalized meshPath = useAnim const VFS::Path::Normalized meshPath = useAnim
? Misc::ResourceHelpers::correctActorModelPath( ? Misc::ResourceHelpers::correctActorModelPath(
VFS::Path::toNormalized(mesh), mRendering.getResourceSystem()->getVFS()) VFS::Path::toNormalized(mesh), mRendering.getResourceSystem()->getVFS())
: VFS::Path::toNormalized(mesh); : VFS::Path::toNormalized(mesh);
if (mRendering.getResourceSystem()->getSceneManager()->checkLoaded(meshPath, mRendering.getReferenceTime())) if (mRendering.getResourceSystem()->getSceneManager()->checkLoaded(meshPath, mRendering.getReferenceTime()))

2
components/esm3/formatversion.hpp
View File

@ -28,7 +28,7 @@ namespace ESM
inline constexpr FormatVersion MaxOldCountFormatVersion = 30; inline constexpr FormatVersion MaxOldCountFormatVersion = 30;
inline constexpr FormatVersion MaxActiveSpellTypeVersion = 31; inline constexpr FormatVersion MaxActiveSpellTypeVersion = 31;
inline constexpr FormatVersion MaxPlayerBeforeCellDataFormatVersion = 32; inline constexpr FormatVersion MaxPlayerBeforeCellDataFormatVersion = 32;
inline constexpr FormatVersion CurrentSaveGameFormatVersion = 34; inline constexpr FormatVersion CurrentSaveGameFormatVersion = 35;
inline constexpr FormatVersion MinSupportedSaveGameFormatVersion = 5; inline constexpr FormatVersion MinSupportedSaveGameFormatVersion = 5;
inline constexpr FormatVersion OpenMW0_48SaveGameFormatVersion = 21; inline constexpr FormatVersion OpenMW0_48SaveGameFormatVersion = 21;