From f9469ffe184a6f82e621824b7985cb9b1a199113 Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 22 Sep 2015 02:28:38 +0000 Subject: [PATCH] Fix clang warning for powerup caps --- similar/main/multi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index 840d6867b..e328e2b33 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -251,7 +251,7 @@ void powerup_cap_state::cap_secondary_ammo(powerup_type_t type, uint16_t &player const uint_fast32_t maximum_allowed = get_max(idx); if (current_on_player + current_in_mine <= maximum_allowed) return; - const auto capped = (current_in_mine < maximum_allowed) ? static_cast(maximum_allowed - current_in_mine) : 0; + const auto capped = static_cast(current_in_mine < maximum_allowed ? maximum_allowed - current_in_mine : 0); player_ammo = capped; con_printf(CON_VERBOSE, "Capping secondary %u due to powerup cap: current=%u max=%u was=%u now=%hu", idx, get_current(idx), get_max(idx), static_cast(current_on_player), capped); }