teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Client] Fix crash for invalid CellRefs in MechanicsHelper::getTarget()

Browse source
This commit is contained in:
David Cernat 2018-07-06 18:39:14 +03:00
parent 4b30a44816
commit 4eb72eecb1
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,12 +111,17 @@ mwmp::Target MechanicsHelper::getTarget(const MWWorld::Ptr& ptr)
else else
{ {
MWWorld::CellRef *ptrRef = &ptr.getCellRef(); MWWorld::CellRef *ptrRef = &ptr.getCellRef();
target.isPlayer = false; if (ptrRef)
target.refId = ptrRef->getRefId(); {
target.refNumIndex = ptrRef->getRefNum().mIndex; target.isPlayer = false;
target.mpNum = ptrRef->getMpNum(); target.refId = ptrRef->getRefId();
target.name = ptr.getClass().getName(ptr); target.refNumIndex = ptrRef->getRefNum().mIndex;
target.mpNum = ptrRef->getMpNum();
target.name = ptr.getClass().getName(ptr);
}
else
clearTarget(target);
} }
return target; return target;