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

Pass reference segment number to choose_thief_recreation_segment

Browse source
This commit is contained in:
Kp 2016-10-02 00:34:41 +00:00
parent 147af3d4f5
commit ae74c6c43a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1185,7 +1185,7 @@ void do_snipe_frame(const vobjptridx_t objp, fix dist_to_player, int player_visi
// ------------------------------------------------------------------------------------------------------
// Choose segment to recreate thief in.
static segnum_t choose_thief_recreation_segment()
static segnum_t choose_thief_recreation_segment(const vcsegidx_t plrseg)
{
segnum_t segnum = segment_none;
int cur_drop_depth;
@ -1193,7 +1193,7 @@ static segnum_t choose_thief_recreation_segment()
cur_drop_depth = THIEF_DEPTH;
while ((segnum == segment_none) && (cur_drop_depth > THIEF_DEPTH/2)) {
segnum = pick_connected_segment(get_local_plrobj().segnum, cur_drop_depth);
segnum = pick_connected_segment(plrseg, cur_drop_depth);
if (segnum != segment_none && vcsegptr(segnum)->special == SEGMENT_IS_CONTROLCEN)
segnum = segment_none;
cur_drop_depth--;
@ -1211,7 +1211,7 @@ static fix64 Re_init_thief_time = 0x3f000000;
// ----------------------------------------------------------------------
void recreate_thief(const uint8_t thief_id)
{
const auto segnum = choose_thief_recreation_segment();
const auto segnum = choose_thief_recreation_segment(ConsoleObject->segnum);
const auto &&segp = vsegptridx(segnum);
const auto &&center_point = compute_segment_center(segp);