From bbcba57495751ffe8a21735dec485939ca264a4a Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 10 Feb 2017 06:26:32 +0100 Subject: [PATCH] Disable hitAttemptActorId saving code for now --- apps/openmw/mwmechanics/creaturestats.cpp | 4 ++-- components/esm/creaturestats.cpp | 10 +++++----- components/esm/creaturestats.hpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp index 89406e883..31724bcbc 100644 --- a/apps/openmw/mwmechanics/creaturestats.cpp +++ b/apps/openmw/mwmechanics/creaturestats.cpp @@ -531,7 +531,7 @@ namespace MWMechanics state.mActorId = mActorId; state.mDeathAnimation = mDeathAnimation; state.mTimeOfDeath = mTimeOfDeath.toEsm(); - state.mHitAttemptActorId = mHitAttemptActorId; + //state.mHitAttemptActorId = mHitAttemptActorId; mSpells.writeState(state.mSpells); mActiveSpells.writeState(state.mActiveSpells); @@ -580,7 +580,7 @@ namespace MWMechanics mActorId = state.mActorId; mDeathAnimation = state.mDeathAnimation; mTimeOfDeath = MWWorld::TimeStamp(state.mTimeOfDeath); - mHitAttemptActorId = state.mHitAttemptActorId; + //mHitAttemptActorId = state.mHitAttemptActorId; mSpells.readState(state.mSpells); mActiveSpells.readState(state.mActiveSpells); diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp index 92f1c3025..beb2c4c64 100644 --- a/components/esm/creaturestats.cpp +++ b/components/esm/creaturestats.cpp @@ -90,8 +90,8 @@ void ESM::CreatureStats::load (ESMReader &esm) mActorId = -1; esm.getHNOT (mActorId, "ACID"); - mHitAttemptActorId = -1; - esm.getHNOT(mHitAttemptActorId, "HAID"); + //mHitAttemptActorId = -1; + //esm.getHNOT(mHitAttemptActorId, "HAID"); mDeathAnimation = -1; esm.getHNOT (mDeathAnimation, "DANM"); @@ -206,8 +206,8 @@ void ESM::CreatureStats::save (ESMWriter &esm) const if (mActorId != -1) esm.writeHNT ("ACID", mActorId); - if (mHitAttemptActorId != -1) - esm.writeHNT("HAID", mHitAttemptActorId); + //if (mHitAttemptActorId != -1) + // esm.writeHNT("HAID", mHitAttemptActorId); if (mDeathAnimation != -1) esm.writeHNT ("DANM", mDeathAnimation); @@ -246,7 +246,7 @@ void ESM::CreatureStats::blank() mTradeTime.mDay = 0; mGoldPool = 0; mActorId = -1; - mHitAttemptActorId = -1; + //mHitAttemptActorId = -1; mHasAiSettings = false; mDead = false; mDeathAnimationFinished = false; diff --git a/components/esm/creaturestats.hpp b/components/esm/creaturestats.hpp index cbb70535f..7e7e5dac3 100644 --- a/components/esm/creaturestats.hpp +++ b/components/esm/creaturestats.hpp @@ -38,7 +38,7 @@ namespace ESM ESM::TimeStamp mTradeTime; int mGoldPool; int mActorId; - int mHitAttemptActorId; + //int mHitAttemptActorId; bool mDead; bool mDeathAnimationFinished;