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

Take into account "Enable Parent" subrecord and disable ESM4 objects that should be initially disabled.

Browse source
This commit is contained in:
Petr Mikheev 2023-09-28 00:20:47 +02:00
parent 3ea14e904d
commit 02de5e82d8
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -406,10 +406,31 @@ namespace MWWorld
static void loadImpl(const R& ref, const MWWorld::ESMStore& esmStore, auto& list) static void loadImpl(const R& ref, const MWWorld::ESMStore& esmStore, auto& list)
{ {
const MWWorld::Store<X>& store = esmStore.get<X>(); const MWWorld::Store<X>& store = esmStore.get<X>();
if (const X* ptr = store.search(ref.mBaseObj)) const X* ptr = store.search(ref.mBaseObj);
list.emplace_back(ref, ptr); if (!ptr)
else {
Log(Debug::Warning) << "Warning: could not resolve cell reference " << ref.mId << " (dropping reference)"; Log(Debug::Warning) << "Warning: could not resolve cell reference " << ref.mId << " (dropping reference)";
return;
}
LiveCellRef<X> liveCellRef(ref, ptr);
if (!ref.mEsp.parent.isZeroOrUnset())
{
// Disable objects that are linked to an initially disabled parent.
// Actually when we will start working on Oblivion/Skyrim scripting we will need to:
// - use the current state of the parent instead of initial state of the parent
// - every time when the parent is enabled/disabled we should also enable/disable
// all objects that are linked to it.
// But for now we assume that the parent remains in its initial state.
const ESM4::Reference* parentRef = esmStore.get<ESM4::Reference>().searchStatic(ref.mEsp.parent);
if (parentRef)
{
bool parentDisabled = parentRef->mFlags & ESM4::Rec_Disabled;
bool inversed = ref.mEsp.flags & ESM4::EnableParent::Flag_Inversed;
if (parentDisabled != inversed)
liveCellRef.mData.disable();
}
}
list.push_back(liveCellRef);
} }
template <typename X> template <typename X>

8
components/esm4/reference.hpp
View file

@ -39,7 +39,13 @@ namespace ESM4
struct EnableParent struct EnableParent
{ {
ESM::FormId parent; ESM::FormId parent;
std::uint32_t flags; // 0x0001 = Set Enable State Opposite Parent, 0x0002 = Pop In std::uint32_t flags;
enum Flags
{
Flag_Inversed = 0x1, // Set enable state opposite to the parent
Flag_PopIn = 0x2,
};
}; };
struct LODReference struct LODReference