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

Revert "Fold escort_set_goal_object calls to exists_in_mine"

Browse source 
This reverts commit 03b0222896.

Commit 03b0222 caused the guidebot to skip over later key goals if an
earlier key goal was unnecessary.  This is incorrect.  Revert it.

Reported-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/271>
This commit is contained in:
Kp 2016-11-21 01:57:08 +00:00
parent 8817307f23
commit f4b7b958cb
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -841,18 +841,13 @@ static escort_goal_t escort_set_goal_object(const player_flags pl_flags)
{
if (Escort_special_goal != ESCORT_GOAL_UNSPECIFIED)
return ESCORT_GOAL_UNSPECIFIED;
powerup_type_t keyid;
escort_goal_t goal;
if (
(!(pl_flags & PLAYER_FLAGS_BLUE_KEY) && (keyid = POW_KEY_BLUE, goal = ESCORT_GOAL_BLUE_KEY, true)) ||
(!(pl_flags & PLAYER_FLAGS_GOLD_KEY) && (keyid = POW_KEY_GOLD, goal = ESCORT_GOAL_GOLD_KEY, true)) ||
(!(pl_flags & PLAYER_FLAGS_RED_KEY) && (keyid = POW_KEY_RED, goal = ESCORT_GOAL_RED_KEY, true))
)
{
if (exists_in_mine(ConsoleObject->segnum, OBJ_POWERUP, keyid, -1, pl_flags) != object_none)
return goal;
}
if (Control_center_destroyed == 0)
if (!(pl_flags & PLAYER_FLAGS_BLUE_KEY) && exists_in_mine(ConsoleObject->segnum, OBJ_POWERUP, POW_KEY_BLUE, -1, pl_flags) != object_none)
return ESCORT_GOAL_BLUE_KEY;
else if (!(pl_flags & PLAYER_FLAGS_GOLD_KEY) && exists_in_mine(ConsoleObject->segnum, OBJ_POWERUP, POW_KEY_GOLD, -1, pl_flags) != object_none)
return ESCORT_GOAL_GOLD_KEY;
else if (!(pl_flags & PLAYER_FLAGS_RED_KEY) && exists_in_mine(ConsoleObject->segnum, OBJ_POWERUP, POW_KEY_RED, -1, pl_flags) != object_none)
return ESCORT_GOAL_RED_KEY;
else if (Control_center_destroyed == 0)
{
if (Boss_teleport_segs.count())
return ESCORT_GOAL_BOSS;