mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 07:39:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2642 from akortunov/warnfix2

Browse source 
Add safety checks for door state
This commit is contained in:
Alexei Dobrohotov 2019-12-23 21:22:56 +03:00 committed by GitHub
commit 2693598d82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@ namespace MWClass
class DoorCustomData : public MWWorld::CustomData class DoorCustomData : public MWWorld::CustomData
{ {
public: public:
MWWorld::DoorState mDoorState; MWWorld::DoorState mDoorState = MWWorld::DoorState::Idle;
virtual MWWorld::CustomData *clone() const; virtual MWWorld::CustomData *clone() const;
@ -344,8 +344,6 @@ namespace MWClass
if (!ptr.getRefData().getCustomData()) if (!ptr.getRefData().getCustomData())
{ {
std::unique_ptr<DoorCustomData> data(new DoorCustomData); std::unique_ptr<DoorCustomData> data(new DoorCustomData);
data->mDoorState = MWWorld::DoorState::Idle;
ptr.getRefData().setCustomData(data.release()); ptr.getRefData().setCustomData(data.release());
} }
} }

10
components/esm/doorstate.cpp
View file

@ -3,6 +3,8 @@
#include "esmreader.hpp" #include "esmreader.hpp"
#include "esmwriter.hpp" #include "esmwriter.hpp"
#include <components/debug/debuglog.hpp>
namespace ESM namespace ESM
{ {
@ -12,12 +14,20 @@ namespace ESM
mDoorState = 0; mDoorState = 0;
esm.getHNOT (mDoorState, "ANIM"); esm.getHNOT (mDoorState, "ANIM");
if (mDoorState < 0 || mDoorState > 2)
Log(Debug::Warning) << "Dropping invalid door state (" << mDoorState << ") for door \"" << mRef.mRefID << "\"";
} }
void DoorState::save(ESMWriter &esm, bool inInventory) const void DoorState::save(ESMWriter &esm, bool inInventory) const
{ {
ObjectState::save(esm, inInventory); ObjectState::save(esm, inInventory);
if (mDoorState < 0 || mDoorState > 2)
{
Log(Debug::Warning) << "Dropping invalid door state (" << mDoorState << ") for door \"" << mRef.mRefID << "\"";
return;
}
if (mDoorState != 0) if (mDoorState != 0)
esm.writeHNT ("ANIM", mDoorState); esm.writeHNT ("ANIM", mDoorState);
} }

2
components/esm/doorstate.hpp
View file

@ -9,7 +9,7 @@ namespace ESM
struct DoorState : public ObjectState struct DoorState : public ObjectState
{ {
int mDoorState; int mDoorState = 0;
virtual void load (ESMReader &esm); virtual void load (ESMReader &esm);
virtual void save (ESMWriter &esm, bool inInventory = false) const; virtual void save (ESMWriter &esm, bool inInventory = false) const;