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

Disable hitAttemptActorId saving code for now

Browse source
This commit is contained in:
scrawl 2017-02-10 06:26:32 +01:00
parent 2ea0db1d1a
commit bbcba57495
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/creaturestats.cpp
View file

@ -531,7 +531,7 @@ namespace MWMechanics
state.mActorId = mActorId; state.mActorId = mActorId;
state.mDeathAnimation = mDeathAnimation; state.mDeathAnimation = mDeathAnimation;
state.mTimeOfDeath = mTimeOfDeath.toEsm(); state.mTimeOfDeath = mTimeOfDeath.toEsm();
state.mHitAttemptActorId = mHitAttemptActorId; //state.mHitAttemptActorId = mHitAttemptActorId;
mSpells.writeState(state.mSpells); mSpells.writeState(state.mSpells);
mActiveSpells.writeState(state.mActiveSpells); mActiveSpells.writeState(state.mActiveSpells);
@ -580,7 +580,7 @@ namespace MWMechanics
mActorId = state.mActorId; mActorId = state.mActorId;
mDeathAnimation = state.mDeathAnimation; mDeathAnimation = state.mDeathAnimation;
mTimeOfDeath = MWWorld::TimeStamp(state.mTimeOfDeath); mTimeOfDeath = MWWorld::TimeStamp(state.mTimeOfDeath);
mHitAttemptActorId = state.mHitAttemptActorId; //mHitAttemptActorId = state.mHitAttemptActorId;
mSpells.readState(state.mSpells); mSpells.readState(state.mSpells);
mActiveSpells.readState(state.mActiveSpells); mActiveSpells.readState(state.mActiveSpells);

10
components/esm/creaturestats.cpp
View file

@ -90,8 +90,8 @@ void ESM::CreatureStats::load (ESMReader &esm)
mActorId = -1; mActorId = -1;
esm.getHNOT (mActorId, "ACID"); esm.getHNOT (mActorId, "ACID");
mHitAttemptActorId = -1; //mHitAttemptActorId = -1;
esm.getHNOT(mHitAttemptActorId, "HAID"); //esm.getHNOT(mHitAttemptActorId, "HAID");
mDeathAnimation = -1; mDeathAnimation = -1;
esm.getHNOT (mDeathAnimation, "DANM"); esm.getHNOT (mDeathAnimation, "DANM");
@ -206,8 +206,8 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
if (mActorId != -1) if (mActorId != -1)
esm.writeHNT ("ACID", mActorId); esm.writeHNT ("ACID", mActorId);
if (mHitAttemptActorId != -1) //if (mHitAttemptActorId != -1)
esm.writeHNT("HAID", mHitAttemptActorId); // esm.writeHNT("HAID", mHitAttemptActorId);
if (mDeathAnimation != -1) if (mDeathAnimation != -1)
esm.writeHNT ("DANM", mDeathAnimation); esm.writeHNT ("DANM", mDeathAnimation);
@ -246,7 +246,7 @@ void ESM::CreatureStats::blank()
mTradeTime.mDay = 0; mTradeTime.mDay = 0;
mGoldPool = 0; mGoldPool = 0;
mActorId = -1; mActorId = -1;
mHitAttemptActorId = -1; //mHitAttemptActorId = -1;
mHasAiSettings = false; mHasAiSettings = false;
mDead = false; mDead = false;
mDeathAnimationFinished = false; mDeathAnimationFinished = false;

2
components/esm/creaturestats.hpp
View file

@ -38,7 +38,7 @@ namespace ESM
ESM::TimeStamp mTradeTime; ESM::TimeStamp mTradeTime;
int mGoldPool; int mGoldPool;
int mActorId; int mActorId;
int mHitAttemptActorId; //int mHitAttemptActorId;
bool mDead; bool mDead;
bool mDeathAnimationFinished; bool mDeathAnimationFinished;