AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 23:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Client] Use more succinct methods for PlayerPtr in MechanicsHelper

Browse Source
This commit is contained in:
David Cernat 2019-12-03 14:12:40 +02:00
parent 21c8821d05
commit 68f524b822
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/openmw/mwmp/MechanicsHelper.cpp
View File

@ -98,7 +98,7 @@ bool MechanicsHelper::isUsingRangedWeapon(const MWWorld::Ptr& ptr)
Attack *MechanicsHelper::getLocalAttack(const MWWorld::Ptr& ptr) Attack *MechanicsHelper::getLocalAttack(const MWWorld::Ptr& ptr)
{ {
if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr()) if (ptr == MWMechanics::getPlayer())
return &mwmp::Main::get().getLocalPlayer()->attack; return &mwmp::Main::get().getLocalPlayer()->attack;
else if (mwmp::Main::get().getCellController()->isLocalActor(ptr)) else if (mwmp::Main::get().getCellController()->isLocalActor(ptr))
return &mwmp::Main::get().getCellController()->getLocalActor(ptr)->attack; return &mwmp::Main::get().getCellController()->getLocalActor(ptr)->attack;
@ -118,7 +118,7 @@ Attack *MechanicsHelper::getDedicatedAttack(const MWWorld::Ptr& ptr)
Cast *MechanicsHelper::getLocalCast(const MWWorld::Ptr& ptr) Cast *MechanicsHelper::getLocalCast(const MWWorld::Ptr& ptr)
{ {
if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr()) if (ptr == MWMechanics::getPlayer())
return &mwmp::Main::get().getLocalPlayer()->cast; return &mwmp::Main::get().getLocalPlayer()->cast;
else if (mwmp::Main::get().getCellController()->isLocalActor(ptr)) else if (mwmp::Main::get().getCellController()->isLocalActor(ptr))
return &mwmp::Main::get().getCellController()->getLocalActor(ptr)->cast; return &mwmp::Main::get().getCellController()->getLocalActor(ptr)->cast;
@ -139,7 +139,7 @@ Cast *MechanicsHelper::getDedicatedCast(const MWWorld::Ptr& ptr)
MWWorld::Ptr MechanicsHelper::getPlayerPtr(const Target& target) MWWorld::Ptr MechanicsHelper::getPlayerPtr(const Target& target)
{ {
if (target.guid == mwmp::Main::get().getLocalPlayer()->guid) if (target.guid == mwmp::Main::get().getLocalPlayer()->guid)
return MWBase::Environment::get().getWorld()->getPlayerPtr(); return MWMechanics::getPlayer();
else if (PlayerList::getPlayer(target.guid) != nullptr) else if (PlayerList::getPlayer(target.guid) != nullptr)
return PlayerList::getPlayer(target.guid)->getPtr(); return PlayerList::getPlayer(target.guid)->getPtr();
@ -170,7 +170,7 @@ mwmp::Target MechanicsHelper::getTarget(const MWWorld::Ptr& ptr)
if (ptr != nullptr) if (ptr != nullptr)
{ {
if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr()) if (ptr == MWMechanics::getPlayer())
{ {
target.isPlayer = true; target.isPlayer = true;
target.guid = mwmp::Main::get().getLocalPlayer()->guid; target.guid = mwmp::Main::get().getLocalPlayer()->guid;
@ -218,7 +218,7 @@ bool MechanicsHelper::isEmptyTarget(const mwmp::Target& target)
void MechanicsHelper::assignAttackTarget(Attack* attack, const MWWorld::Ptr& target) void MechanicsHelper::assignAttackTarget(Attack* attack, const MWWorld::Ptr& target)
{ {
if (target == MWBase::Environment::get().getWorld()->getPlayerPtr()) if (target == MWMechanics::getPlayer())
{ {
attack->target.isPlayer = true; attack->target.isPlayer = true;
attack->target.guid = mwmp::Main::get().getLocalPlayer()->guid; attack->target.guid = mwmp::Main::get().getLocalPlayer()->guid;
@ -296,7 +296,7 @@ void MechanicsHelper::processAttack(Attack attack, const MWWorld::Ptr& attacker)
if (attack.target.isPlayer) if (attack.target.isPlayer)
{ {
if (attack.target.guid == mwmp::Main::get().getLocalPlayer()->guid) if (attack.target.guid == mwmp::Main::get().getLocalPlayer()->guid)
victim = MWBase::Environment::get().getWorld()->getPlayerPtr(); victim = MWMechanics::getPlayer();
else if (PlayerList::getPlayer(attack.target.guid) != nullptr) else if (PlayerList::getPlayer(attack.target.guid) != nullptr)
victim = PlayerList::getPlayer(attack.target.guid)->getPtr(); victim = PlayerList::getPlayer(attack.target.guid)->getPtr();
} }
@ -444,7 +444,7 @@ void MechanicsHelper::processCast(Cast cast, const MWWorld::Ptr& caster)
if (cast.target.isPlayer) if (cast.target.isPlayer)
{ {
if (cast.target.guid == mwmp::Main::get().getLocalPlayer()->guid) if (cast.target.guid == mwmp::Main::get().getLocalPlayer()->guid)
victim = MWBase::Environment::get().getWorld()->getPlayerPtr(); victim = MWMechanics::getPlayer();
else if (PlayerList::getPlayer(cast.target.guid) != nullptr) else if (PlayerList::getPlayer(cast.target.guid) != nullptr)
victim = PlayerList::getPlayer(cast.target.guid)->getPtr(); victim = PlayerList::getPlayer(cast.target.guid)->getPtr();
} }