|
|
@ -2143,16 +2143,6 @@ namespace MWMechanics
|
|
|
|
End of tes3mp change (major)
|
|
|
|
End of tes3mp change (major)
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
Start of tes3mp addition
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Store the current actor's Ptr so it can be retrieved from inside ActiveSpells for
|
|
|
|
|
|
|
|
multiplayer logic purposes
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
MechanicsHelper::storeCurrentActor(iter->first);
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
End of tes3mp addition
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().update(duration);
|
|
|
|
iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().update(duration);
|
|
|
|
|
|
|
|
|
|
|
|
const Misc::TimerStatus engageCombatTimerStatus = iter->second->updateEngageCombatTimer(duration);
|
|
|
|
const Misc::TimerStatus engageCombatTimerStatus = iter->second->updateEngageCombatTimer(duration);
|
|
|
@ -2555,16 +2545,6 @@ namespace MWMechanics
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (iter->first.getClass().getCreatureStats(iter->first).isDead())
|
|
|
|
if (iter->first.getClass().getCreatureStats(iter->first).isDead())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
|
|
|
|
Start of tes3mp addition
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Store the current actor's Ptr so it can be retrieved from inside ActiveSpells for
|
|
|
|
|
|
|
|
multiplayer logic purposes
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
MechanicsHelper::storeCurrentActor(iter->first);
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
End of tes3mp addition
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().update(duration);
|
|
|
|
iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().update(duration);
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -2584,17 +2564,6 @@ namespace MWMechanics
|
|
|
|
if (iter->first.getClass().isNpc())
|
|
|
|
if (iter->first.getClass().isNpc())
|
|
|
|
calculateNpcStatModifiers(iter->first, duration);
|
|
|
|
calculateNpcStatModifiers(iter->first, duration);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
Start of tes3mp addition
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Store the current actor's Ptr so it can be retrieved from inside ActiveSpells for
|
|
|
|
|
|
|
|
multiplayer logic purposes
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
MechanicsHelper::storeCurrentActor(iter->first);
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
End of tes3mp addition
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().update(duration);
|
|
|
|
iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().update(duration);
|
|
|
|
|
|
|
|
|
|
|
|
MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(iter->first);
|
|
|
|
MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(iter->first);
|
|
|
|