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

Use valptr for escort highest_valid

Browse source
This commit is contained in:
Kp 2015-06-13 22:42:16 +00:00
parent 32f256311d
commit 3980c5d472
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -426,10 +426,12 @@ static void thief_message(const char * format, ... )
static int marker_exists_in_mine(int id)
{
range_for (const auto i, highest_valid(Objects))
if (Objects[i].type == OBJ_MARKER)
if (Objects[i].id == id)
{
const auto &&objp = vcobjptr(static_cast<objnum_t>(i));
if (objp->type == OBJ_MARKER)
if (objp->id == id)
return 1;
}
return 0;
}
@ -508,10 +510,12 @@ void set_escort_special_goal(int special_key)
static int get_boss_id(void)
{
range_for (const auto i, highest_valid(Objects))
if (Objects[i].type == OBJ_ROBOT)
if (Robot_info[get_robot_id(&Objects[i])].boss_flag)
return Objects[i].id;
{
const auto &&objp = vcobjptr(static_cast<objnum_t>(i));
if (objp->type == OBJ_ROBOT)
if (Robot_info[get_robot_id(objp)].boss_flag)
return objp->id;
}
return -1;
}
@ -607,9 +611,12 @@ static segnum_t find_exit_segment(void)
{
// ---------- Find exit doors ----------
range_for (const auto i, highest_valid(Segments))
range_for (const auto j, Segments[i].children)
{
const auto &&segp = vcsegptr(static_cast<segnum_t>(i));
range_for (const auto j, segp->children)
if (j == segment_exit)
return i;
}
return segment_none;
}