From f74f879145b7096ae94419ab22a5fc1d67032209 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 19 Apr 2015 04:18:50 +0000 Subject: [PATCH] Simplify do_weapon_select call --- similar/main/gamecntl.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/similar/main/gamecntl.cpp b/similar/main/gamecntl.cpp index 77b253f6f..878b730ec 100644 --- a/similar/main/gamecntl.cpp +++ b/similar/main/gamecntl.cpp @@ -250,9 +250,8 @@ static void do_weapon_n_item_stuff() } if (Controls.state.select_weapon > 0) { - Controls.state.select_weapon--; - do_weapon_select(Controls.state.select_weapon>4?Controls.state.select_weapon-5:Controls.state.select_weapon,Controls.state.select_weapon>4?1:0); - Controls.state.select_weapon = 0; + const auto select_weapon = exchange(Controls.state.select_weapon, 0) - 1; + do_weapon_select(select_weapon > 4 ? select_weapon - 5 : select_weapon, select_weapon > 4); } #if defined(DXX_BUILD_DESCENT_II) if (auto &headlight = Controls.state.headlight)