mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 06:09:42 +00:00
Code Issues Releases Wiki Activity

Remove unused mLastDrowningHit

Browse source
This commit is contained in:
scrawl 2015-01-16 04:55:42 +01:00
parent 714b19015c
commit 1869d37cfc
4 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwmechanics/npcstats.cpp
View file

@ -33,7 +33,6 @@ MWMechanics::NpcStats::NpcStats()
, mWerewolfKills (0)
, mProfit(0)
, mTimeToStartDrowning(20.0)
, mLastDrowningHit(0)
{
mSkillIncreases.resize (ESM::Attribute::Length, 0);
}
@ -522,7 +521,6 @@ void MWMechanics::NpcStats::writeState (ESM::NpcStats& state) const
std::copy (mUsedIds.begin(), mUsedIds.end(), std::back_inserter (state.mUsedIds));
state.mTimeToStartDrowning = mTimeToStartDrowning;
state.mLastDrowningHit = mLastDrowningHit;
}
void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
@ -573,5 +571,4 @@ void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
mUsedIds.insert (*iter);
mTimeToStartDrowning = state.mTimeToStartDrowning;
mLastDrowningHit = state.mLastDrowningHit;
}

2
apps/openmw/mwmechanics/npcstats.hpp
View file

@ -46,8 +46,6 @@ namespace MWMechanics
/// Countdown to getting damage while underwater
float mTimeToStartDrowning;
/// time since last hit from drowning
float mLastDrowningHit;
public:

8
components/esm/npcstats.cpp
View file

@ -75,8 +75,9 @@ void ESM::NpcStats::load (ESMReader &esm)
mTimeToStartDrowning = 0;
esm.getHNOT (mTimeToStartDrowning, "DRTI");
mLastDrowningHit = 0;
esm.getHNOT (mLastDrowningHit, "DRLH");
// No longer used
float lastDrowningHit = 0;
esm.getHNOT (lastDrowningHit, "DRLH");
// No longer used
float levelHealthBonus = 0;
@ -146,9 +147,6 @@ void ESM::NpcStats::save (ESMWriter &esm) const
if (mTimeToStartDrowning)
esm.writeHNT ("DRTI", mTimeToStartDrowning);
if (mLastDrowningHit)
esm.writeHNT ("DRLH", mLastDrowningHit);
if (mCrimeId != -1)
esm.writeHNT ("CRID", mCrimeId);
}

1
components/esm/npcstats.hpp
View file

@ -45,7 +45,6 @@ namespace ESM
int mSkillIncrease[8];
std::vector<std::string> mUsedIds;
float mTimeToStartDrowning;
float mLastDrowningHit;
int mCrimeId;
void load (ESMReader &esm);