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

Issue #342: various fixes

Browse source
This commit is contained in:
Marc Zinnschlag 2012-07-17 16:44:55 +02:00
parent 76de2f7360
commit beb18282bb
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,8 +18,8 @@ namespace MWMechanics
{ {
// magic effects // magic effects
adjustMagicEffects (ptr); adjustMagicEffects (ptr);
calculateDynamicStats (ptr);
calculateCreatureStatModifiers (ptr); calculateCreatureStatModifiers (ptr);
calculateDynamicStats (ptr);
} }
void Actors::updateNpc (const MWWorld::Ptr& ptr, float duration, bool paused) void Actors::updateNpc (const MWWorld::Ptr& ptr, float duration, bool paused)
@ -78,7 +78,7 @@ namespace MWMechanics
int modifier = creatureStats.mMagicEffects.get (EffectKey (79, i)).mMagnitude int modifier = creatureStats.mMagicEffects.get (EffectKey (79, i)).mMagnitude
- creatureStats.mMagicEffects.get (EffectKey (17, i)).mMagnitude; - creatureStats.mMagicEffects.get (EffectKey (17, i)).mMagnitude;
creatureStats.mAttributes[0].setModifier (modifier); creatureStats.mAttributes[i].setModifier (modifier);
} }
// dynamic stats // dynamic stats
@ -87,7 +87,7 @@ namespace MWMechanics
int modifier = creatureStats.mMagicEffects.get (EffectKey (80+i)).mMagnitude int modifier = creatureStats.mMagicEffects.get (EffectKey (80+i)).mMagnitude
- creatureStats.mMagicEffects.get (EffectKey (18+i)).mMagnitude; - creatureStats.mMagicEffects.get (EffectKey (18+i)).mMagnitude;
creatureStats.mDynamic[0].setModifier (modifier); creatureStats.mDynamic[i].setModifier (modifier);
} }
} }

2
apps/openmw/mwworld/actionapply.cpp
View file

@ -22,7 +22,7 @@ namespace MWWorld
void ActionApplyWithSkill::execute() void ActionApplyWithSkill::execute()
{ {
if (MWWorld::Class::get (mTarget).apply (mTarget, mId, mActor)) if (MWWorld::Class::get (mTarget).apply (mTarget, mId, mActor) && mUsageType!=-1)
MWWorld::Class::get (mTarget).skillUsageSucceeded (mActor, mSkillIndex, mUsageType); MWWorld::Class::get (mTarget).skillUsageSucceeded (mActor, mSkillIndex, mUsageType);
} }
} }