diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index 6d77b67d3..e02a81c77 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -2143,16 +2143,6 @@ namespace MWMechanics 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); const Misc::TimerStatus engageCombatTimerStatus = iter->second->updateEngageCombatTimer(duration); @@ -2555,16 +2545,6 @@ namespace MWMechanics { 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); continue; } @@ -2584,17 +2564,6 @@ namespace MWMechanics if (iter->first.getClass().isNpc()) 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); MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(iter->first); diff --git a/apps/openmw/mwmp/MechanicsHelper.cpp b/apps/openmw/mwmp/MechanicsHelper.cpp index d99310992..cc4337139 100644 --- a/apps/openmw/mwmp/MechanicsHelper.cpp +++ b/apps/openmw/mwmp/MechanicsHelper.cpp @@ -628,13 +628,3 @@ MWWorld::Ptr MechanicsHelper::getItemPtrFromStore(const mwmp::Item& item, MWWorl return closestPtr; } - -MWWorld::Ptr MechanicsHelper::getCurrentActor() -{ - return currentActor; -} - -void MechanicsHelper::storeCurrentActor(const MWWorld::Ptr& actor) -{ - currentActor = actor; -} diff --git a/apps/openmw/mwmp/MechanicsHelper.hpp b/apps/openmw/mwmp/MechanicsHelper.hpp index e497930f1..684bacddc 100644 --- a/apps/openmw/mwmp/MechanicsHelper.hpp +++ b/apps/openmw/mwmp/MechanicsHelper.hpp @@ -50,11 +50,6 @@ namespace MechanicsHelper 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 getCurrentActor(); - void storeCurrentActor(const MWWorld::Ptr& actor); - - static MWWorld::Ptr currentActor; }