mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-20 10:20:50 +00:00
Code Issues Projects Releases Wiki Activity

Avoid needlessly copying the MagicEffects

Browse Source
This commit is contained in:
Chris Robinson 2013-08-27 21:40:31 -07:00
parent 281fdbd81b
commit 305b5fec0f
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/openmw/mwmechanics/actors.cpp
View File

@ -136,27 +136,24 @@ namespace MWMechanics
void Actors::calculateCreatureStatModifiers (const MWWorld::Ptr& ptr) void Actors::calculateCreatureStatModifiers (const MWWorld::Ptr& ptr)
{ {
CreatureStats &creatureStats = MWWorld::Class::get(ptr).getCreatureStats(ptr); CreatureStats &creatureStats = MWWorld::Class::get(ptr).getCreatureStats(ptr);
const MagicEffects &effects = creatureStats.getMagicEffects();
// attributes // attributes
for (int i=0; i<8; ++i) for(int i = 0;i < ESM::Attribute::Length;++i)
{ {
int modifier = Stat<int> stat = creatureStats.getAttribute(i);
creatureStats.getMagicEffects().get (EffectKey (ESM::MagicEffect::FortifyAttribute, i)).mMagnitude; stat.setModifier(effects.get(EffectKey(ESM::MagicEffect::FortifyAttribute, i)).mMagnitude -
effects.get(EffectKey(ESM::MagicEffect::DrainAttribute, i)).mMagnitude);
modifier -= creatureStats.getMagicEffects().get (EffectKey (ESM::MagicEffect::DrainAttribute, i)).mMagnitude; creatureStats.setAttribute(i, stat);
creatureStats.getAttribute(i).setModifier (modifier);
} }
// dynamic stats // dynamic stats
MagicEffects effects = creatureStats.getMagicEffects();
for(int i = 0;i < 3;++i) for(int i = 0;i < 3;++i)
{ {
DynamicStat<float> stat = creatureStats.getDynamic(i); DynamicStat<float> stat = creatureStats.getDynamic(i);
stat.setModifier(effects.get(EffectKey(80+i)).mMagnitude -
stat.setModifier ( effects.get(EffectKey(18+i)).mMagnitude);
effects.get (EffectKey(80+i)).mMagnitude - effects.get (EffectKey(18+i)).mMagnitude);
creatureStats.setDynamic(i, stat); creatureStats.setDynamic(i, stat);
} }