mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 07:36:44 +00:00
Code Issues Releases Wiki Activity

[Client] Remove previous placeholders for tracking ActiveSpells actors

Browse source
This commit is contained in:
David Cernat 2021-10-12 01:20:38 +02:00
parent c027862609
commit f03a87df3c
3 changed files with 0 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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);

10
apps/openmw/mwmp/MechanicsHelper.cpp
View file

@ -628,13 +628,3 @@ MWWorld::Ptr MechanicsHelper::getItemPtrFromStore(const mwmp::Item& item, MWWorl
return closestPtr; return closestPtr;
} }
MWWorld::Ptr MechanicsHelper::getCurrentActor()
{
return currentActor;
}
void MechanicsHelper::storeCurrentActor(const MWWorld::Ptr& actor)
{
currentActor = actor;
}

5
apps/openmw/mwmp/MechanicsHelper.hpp
View file

@ -50,11 +50,6 @@ namespace MechanicsHelper
void unequipItemsByEffect(const MWWorld::Ptr& ptr, short enchantmentType, short effectId, short attributeId = -1, short skillId = -1); void unequipItemsByEffect(const MWWorld::Ptr& ptr, short enchantmentType, short effectId, short attributeId = -1, short skillId = -1);
MWWorld::Ptr getItemPtrFromStore(const mwmp::Item& item, MWWorld::ContainerStore& store); MWWorld::Ptr getItemPtrFromStore(const mwmp::Item& item, MWWorld::ContainerStore& store);
MWWorld::Ptr getCurrentActor();
void storeCurrentActor(const MWWorld::Ptr& actor);
static MWWorld::Ptr currentActor;
} }