teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Utilize the mHasCustomData flag in writeAdditionalState

Browse source
This commit is contained in:
scrawl 2015-12-18 00:07:13 +01:00
parent 19d87c78f2
commit eb51e2838f
5 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwclass/container.cpp
View file

@ -299,6 +299,8 @@ namespace MWClass
void Container::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const void Container::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const
{ {
if (!state.mHasCustomState)
return;
const ESM::ContainerState& state2 = dynamic_cast<const ESM::ContainerState&> (state); const ESM::ContainerState& state2 = dynamic_cast<const ESM::ContainerState&> (state);
if (!ptr.getRefData().getCustomData()) if (!ptr.getRefData().getCustomData())
@ -316,7 +318,11 @@ namespace MWClass
{ {
ESM::ContainerState& state2 = dynamic_cast<ESM::ContainerState&> (state); ESM::ContainerState& state2 = dynamic_cast<ESM::ContainerState&> (state);
ensureCustomData (ptr); if (!ptr.getRefData().getCustomData())
{
state.mHasCustomState = false;
return;
}
dynamic_cast<ContainerCustomData&> (*ptr.getRefData().getCustomData()).mContainerStore. dynamic_cast<ContainerCustomData&> (*ptr.getRefData().getCustomData()).mContainerStore.
writeState (state2.mInventory); writeState (state2.mInventory);

2
apps/openmw/mwclass/creature.cpp
View file

@ -735,8 +735,6 @@ namespace MWClass
return; return;
} }
ensureCustomData (ptr);
CreatureCustomData& customData = ptr.getRefData().getCustomData()->asCreatureCustomData(); CreatureCustomData& customData = ptr.getRefData().getCustomData()->asCreatureCustomData();
customData.mContainerStore->writeState (state2.mInventory); customData.mContainerStore->writeState (state2.mInventory);

10
apps/openmw/mwclass/creaturelevlist.cpp
View file

@ -104,6 +104,9 @@ namespace MWClass
void CreatureLevList::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) void CreatureLevList::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state)
const const
{ {
if (!state.mHasCustomState)
return;
const ESM::CreatureLevListState& state2 = dynamic_cast<const ESM::CreatureLevListState&> (state); const ESM::CreatureLevListState& state2 = dynamic_cast<const ESM::CreatureLevListState&> (state);
ensureCustomData(ptr); ensureCustomData(ptr);
@ -117,7 +120,12 @@ namespace MWClass
{ {
ESM::CreatureLevListState& state2 = dynamic_cast<ESM::CreatureLevListState&> (state); ESM::CreatureLevListState& state2 = dynamic_cast<ESM::CreatureLevListState&> (state);
ensureCustomData(ptr); if (!ptr.getRefData().getCustomData())
{
state.mHasCustomState = false;
return;
}
CreatureLevListCustomData& customData = ptr.getRefData().getCustomData()->asCreatureLevListCustomData(); CreatureLevListCustomData& customData = ptr.getRefData().getCustomData()->asCreatureLevListCustomData();
state2.mSpawnActorId = customData.mSpawnActorId; state2.mSpawnActorId = customData.mSpawnActorId;
state2.mSpawn = customData.mSpawn; state2.mSpawn = customData.mSpawn;

8
apps/openmw/mwclass/door.cpp
View file

@ -343,6 +343,8 @@ namespace MWClass
void Door::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const void Door::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const
{ {
if (!state.mHasCustomState)
return;
ensureCustomData(ptr); ensureCustomData(ptr);
DoorCustomData& customData = ptr.getRefData().getCustomData()->asDoorCustomData(); DoorCustomData& customData = ptr.getRefData().getCustomData()->asDoorCustomData();
@ -352,7 +354,11 @@ namespace MWClass
void Door::writeAdditionalState (const MWWorld::Ptr& ptr, ESM::ObjectState& state) const void Door::writeAdditionalState (const MWWorld::Ptr& ptr, ESM::ObjectState& state) const
{ {
ensureCustomData(ptr); if (!ptr.getRefData().getCustomData())
{
state.mHasCustomState = false;
return;
}
const DoorCustomData& customData = ptr.getRefData().getCustomData()->asDoorCustomData(); const DoorCustomData& customData = ptr.getRefData().getCustomData()->asDoorCustomData();
ESM::DoorState& state2 = dynamic_cast<ESM::DoorState&>(state); ESM::DoorState& state2 = dynamic_cast<ESM::DoorState&>(state);

2
apps/openmw/mwclass/npc.cpp
View file

@ -1187,8 +1187,6 @@ namespace MWClass
return; return;
} }
ensureCustomData (ptr);
NpcCustomData& customData = ptr.getRefData().getCustomData()->asNpcCustomData(); NpcCustomData& customData = ptr.getRefData().getCustomData()->asNpcCustomData();
customData.mInventoryStore.writeState (state2.mInventory); customData.mInventoryStore.writeState (state2.mInventory);