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

Check return of pick_connected_segment before use

Browse source
This commit is contained in:
Kp 2015-09-29 02:41:22 +00:00
parent 6224b53581
commit edccaa91f6
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/fireball.h
View file

@ -101,6 +101,6 @@ void expl_wall_read_n_swap(PHYSFS_file *fp, int swap, partial_range_t<expl_wall
extern fix Flash_effect;
#endif
int pick_connected_segment(vcobjptr_t objp, int max_depth);
segidx_t pick_connected_segment(vcobjptr_t objp, int max_depth);
#endif

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

@ -1164,7 +1164,7 @@ static segnum_t choose_thief_recreation_segment()
while ((segnum == segment_none) && (cur_drop_depth > THIEF_DEPTH/2)) {
segnum = pick_connected_segment(&get_local_plrobj(), cur_drop_depth);
if (Segments[segnum].special == SEGMENT_IS_CONTROLCEN)
if (segnum != segment_none && vcsegptr(segnum)->special == SEGMENT_IS_CONTROLCEN)
segnum = segment_none;
cur_drop_depth--;
}

9
similar/main/fireball.cpp
View file

@ -419,7 +419,7 @@ static int door_is_openable_by_player(const vcsegptr_t segp, int sidenum)
// --------------------------------------------------------------------------------------------------------------------
// Return a segment %i segments away from initial segment.
// Returns -1 if can't find a segment that distance away.
int pick_connected_segment(const vcobjptr_t objp, int max_depth)
segidx_t pick_connected_segment(const vcobjptr_t objp, int max_depth)
{
using std::swap;
int i;
@ -497,12 +497,11 @@ int pick_connected_segment(const vcobjptr_t objp, int max_depth)
if (seg_queue[tail] > Highest_segment_index)
{
// -- Int3(); // Something bad has happened. Queue is trashed. --MK, 12/13/94
return -1;
return segment_none;
}
cur_depth = depth[seg_queue[tail]];
}
return -1;
return segment_none;
}
#if defined(DXX_BUILD_DESCENT_I)
@ -586,7 +585,7 @@ static segnum_t choose_drop_segment()
while (cur_drop_depth > 0 && segnum == segment_none) // before dropping in random segment, try to find ANY segment which is connected to the player responsible for the drop so object will not spawn in inaccessible areas
{
segnum = pick_connected_segment(vcobjptr(get_local_player().objnum), --cur_drop_depth);
if (Segments[segnum].special == SEGMENT_IS_CONTROLCEN)
if (segnum != segment_none && vcsegptr(segnum)->special == SEGMENT_IS_CONTROLCEN)
segnum = segment_none;
}
return ((segnum == segment_none)?((d_rand() * Highest_segment_index) >> 15):segnum); // basically it should be impossible segnum == -1 now... but oh well...