TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix crash on object_guidebot_cannot_reach

Browse source 
escort_get_goal_segment expected exists_in_mine to return object_none or
a valid object.  In some mines, exists_in_mine will return
object_guidebot_cannot_reach, which is neither object_none nor a valid
object.  Exclude reading the segment of the unreachable object.
This commit is contained in:
Kp 2016-10-05 03:55:19 +00:00
parent d4b85de49b
commit ba2b8c05ba
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
d2x-rebirth/main/escort.cpp
View file

@ -733,7 +733,7 @@ static segnum_t escort_get_goal_segment(const vcobjptr_t objp, int objtype, int
{
const auto egi = exists_in_mine(objp->segnum, objtype, objid, -1);
Escort_goal_index = egi;
if (egi != object_none)
if (egi != object_none && egi != object_guidebot_cannot_reach)
return vcobjptr(egi)->segnum;
return segment_none;
}