From 1216c26704b028e32823a089cf6522fff764e726 Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 28 May 2015 03:08:40 +0000 Subject: [PATCH] Make exit nextcenter const --- similar/main/endlevel.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/similar/main/endlevel.cpp b/similar/main/endlevel.cpp index 0b3e5eaa7..cf201f106 100644 --- a/similar/main/endlevel.cpp +++ b/similar/main/endlevel.cpp @@ -1185,7 +1185,6 @@ void do_endlevel_flythrough(flythrough_data *flydata) auto pseg = &Segments[obj->segnum]; if (flydata->first_time || obj->segnum != old_player_seg) { //moved into new seg - vms_vector nextcenter; fix seg_time; short entry_side,exit_side = -1;//what sides we entry and leave through int up_side=0; @@ -1216,10 +1215,9 @@ void do_endlevel_flythrough(flythrough_data *flydata) //where we are heading (center of exit_side) auto dest_point = compute_center_point_on_side(pseg,exit_side); - if (pseg->children[exit_side] == segment_exit) - nextcenter = dest_point; - else - compute_segment_center(nextcenter,&Segments[pseg->children[exit_side]]); + const vms_vector nextcenter = (pseg->children[exit_side] == segment_exit) + ? dest_point + : compute_segment_center(vcsegptr(pseg->children[exit_side])); //update target point and movement points