From ae74c6c43ad909c257981b6e8b46f478485eccf1 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 2 Oct 2016 00:34:41 +0000 Subject: [PATCH] Pass reference segment number to choose_thief_recreation_segment --- d2x-rebirth/main/escort.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/d2x-rebirth/main/escort.cpp b/d2x-rebirth/main/escort.cpp index 46ad6958c..c5e34cc86 100644 --- a/d2x-rebirth/main/escort.cpp +++ b/d2x-rebirth/main/escort.cpp @@ -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 &¢er_point = compute_segment_center(segp);