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

[Client] Rework MechanicsHelper::getTarget() to avoid crashes

Browse Source
This commit is contained in:
David Cernat 2018-07-07 11:43:57 +03:00
parent 7f0549fc4f
commit 509882b5f6
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,10 @@ MWWorld::Ptr MechanicsHelper::getPlayerPtr(const Target& target)
mwmp::Target MechanicsHelper::getTarget(const MWWorld::Ptr& ptr) mwmp::Target MechanicsHelper::getTarget(const MWWorld::Ptr& ptr)
{ {
mwmp::Target target; mwmp::Target target;
clearTarget(target);
if (ptr != nullptr)
{
if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr()) if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
{ {
target.isPlayer = true; target.isPlayer = true;
@ -120,8 +123,7 @@ mwmp::Target MechanicsHelper::getTarget(const MWWorld::Ptr& ptr)
target.mpNum = ptrRef->getMpNum(); target.mpNum = ptrRef->getMpNum();
target.name = ptr.getClass().getName(ptr); target.name = ptr.getClass().getName(ptr);
} }
else }
clearTarget(target);
} }
return target; return target;