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

Fold escort_set_goal_object calls to exists_in_mine

Browse source
This commit is contained in:
Kp 2016-10-15 00:53:20 +00:00
parent ad35460eb0
commit 03b0222896
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -842,13 +842,19 @@ static escort_goal_t escort_set_goal_object(const player_flags pl_flags)
{
if (Escort_special_goal != ESCORT_GOAL_UNSPECIFIED)
return ESCORT_GOAL_UNSPECIFIED;
if (!(pl_flags & PLAYER_FLAGS_BLUE_KEY) && (exists_in_mine(ConsoleObject->segnum, OBJ_POWERUP, POW_KEY_BLUE, -1) != 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) != 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) != object_none))
return ESCORT_GOAL_RED_KEY;
else if (Control_center_destroyed == 0) {
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) != object_none)
return goal;
}
if (Control_center_destroyed == 0)
{
if (Boss_teleport_segs.count())
return ESCORT_GOAL_BOSS;
else