Skip to content

Commit 6634024

Browse files
committed
clang and readability
1 parent 6e827c6 commit 6634024

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

code/ship/ship.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16464,9 +16464,10 @@ int ship_do_rearm_frame( object *objp, float frametime )
1646416464
if (rearm_pool == 0) {
1646516465
// Pool exhausted: try a precedence swap; otherwise this bank is unrearmable this frame.
1646616466
// Either way, fall through so the trailing "first missile" block still clears the flag.
16467-
if (!(The_mission.support_ships.allow_rearm_weapon_precedence &&
16468-
swp->secondary_bank_ammo[i] == 0 &&
16469-
maybe_swap_to_precedence_rearm_weapon(shipp, i, true))) {
16467+
const bool swapped = The_mission.support_ships.allow_rearm_weapon_precedence &&
16468+
swp->secondary_bank_ammo[i] == 0 &&
16469+
maybe_swap_to_precedence_rearm_weapon(shipp, i, true);
16470+
if (!swapped) {
1647016471
banks_full++;
1647116472
}
1647216473
} else {
@@ -16546,9 +16547,10 @@ int ship_do_rearm_frame( object *objp, float frametime )
1654616547
if (rearm_pool == 0) {
1654716548
// Pool exhausted: try a precedence swap; otherwise this bank is unrearmable this frame.
1654816549
// Either way, fall through so the trailing "first ballistic" block still clears the flag.
16549-
if (!(The_mission.support_ships.allow_rearm_weapon_precedence &&
16550-
swp->primary_bank_ammo[i] == 0 &&
16551-
maybe_swap_to_precedence_rearm_weapon(shipp, i, false))) {
16550+
const bool swapped = The_mission.support_ships.allow_rearm_weapon_precedence &&
16551+
swp->primary_bank_ammo[i] == 0 &&
16552+
maybe_swap_to_precedence_rearm_weapon(shipp, i, false);
16553+
if (!swapped) {
1655216554
primary_banks_full++;
1655316555
}
1655416556
} else {

0 commit comments

Comments
 (0)