mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 10:11:33 +00:00
Code Issues Releases Wiki Activity

Remove friendly hits from the save file

Browse source 
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
This commit is contained in:
scrawl 2015-01-30 22:22:47 +01:00
parent ef3ba12cb6
commit b9acf437fd
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -495,7 +495,10 @@ namespace MWMechanics
state.mDead = mDead; state.mDead = mDead;
state.mDied = mDied; state.mDied = mDied;
state.mMurdered = mMurdered; state.mMurdered = mMurdered;
state.mFriendlyHits = mFriendlyHits; // The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism
// that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature
// rather than a bug.
//state.mFriendlyHits = mFriendlyHits;
state.mTalkedTo = mTalkedTo; state.mTalkedTo = mTalkedTo;
state.mAlarmed = mAlarmed; state.mAlarmed = mAlarmed;
state.mAttacked = mAttacked; state.mAttacked = mAttacked;
@ -544,7 +547,6 @@ namespace MWMechanics
mDead = state.mDead; mDead = state.mDead;
mDied = state.mDied; mDied = state.mDied;
mMurdered = state.mMurdered; mMurdered = state.mMurdered;
mFriendlyHits = state.mFriendlyHits;
mTalkedTo = state.mTalkedTo; mTalkedTo = state.mTalkedTo;
mAlarmed = state.mAlarmed; mAlarmed = state.mAlarmed;
mAttacked = state.mAttacked; mAttacked = state.mAttacked;

8
components/esm/creaturestats.cpp
View file

@ -24,8 +24,8 @@ void ESM::CreatureStats::load (ESMReader &esm)
mMurdered = false; mMurdered = false;
esm.getHNOT (mMurdered, "MURD"); esm.getHNOT (mMurdered, "MURD");
mFriendlyHits = 0; if (esm.isNextSub("FRHT"))
esm.getHNOT (mFriendlyHits, "FRHT"); esm.skipHSub(); // Friendly hits, no longer used
mTalkedTo = false; mTalkedTo = false;
esm.getHNOT (mTalkedTo, "TALK"); esm.getHNOT (mTalkedTo, "TALK");
@ -140,9 +140,6 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
if (mMurdered) if (mMurdered)
esm.writeHNT ("MURD", mMurdered); esm.writeHNT ("MURD", mMurdered);
if (mFriendlyHits)
esm.writeHNT ("FRHT", mFriendlyHits);
if (mTalkedTo) if (mTalkedTo)
esm.writeHNT ("TALK", mTalkedTo); esm.writeHNT ("TALK", mTalkedTo);
@ -235,7 +232,6 @@ void ESM::CreatureStats::blank()
mDead = false; mDead = false;
mDied = false; mDied = false;
mMurdered = false; mMurdered = false;
mFriendlyHits = 0;
mTalkedTo = false; mTalkedTo = false;
mAlarmed = false; mAlarmed = false;
mAttacked = false; mAttacked = false;

1
components/esm/creaturestats.hpp
View file

@ -42,7 +42,6 @@ namespace ESM
bool mDead; bool mDead;
bool mDied; bool mDied;
bool mMurdered; bool mMurdered;
int mFriendlyHits;
bool mTalkedTo; bool mTalkedTo;
bool mAlarmed; bool mAlarmed;
bool mAttacked; bool mAttacked;