From 1d568fa56eb1cd874dd069920d3fb9777a0b8e2a Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 14 Jul 2016 01:59:03 +0000 Subject: [PATCH] Move MultiLevelInv_Count for vulcan/gauss to use fallthrough --- similar/main/multi.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index 07ed016ee..ba4f69174 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -4934,6 +4934,12 @@ void MultiLevelInv_Count(bool initial) auto pid = get_powerup_id(objp); switch (pid) { + case POW_VULCAN_WEAPON: +#if defined(DXX_BUILD_DESCENT_II) + case POW_GAUSS_WEAPON: +#endif + MultiLevelInv.Current[POW_VULCAN_AMMO] += objp->ctype.powerup_info.count; // add contained ammo so we do not lose this from level when used up + /* fall through to increment Current[pid] */ case POW_LASER: case POW_QUAD_FIRE: case POW_SPREADFIRE_WEAPON: @@ -4964,13 +4970,6 @@ void MultiLevelInv_Count(bool initial) #endif MultiLevelInv.Current[pid]++; break; - case POW_VULCAN_WEAPON: -#if defined(DXX_BUILD_DESCENT_II) - case POW_GAUSS_WEAPON: -#endif - MultiLevelInv.Current[pid]++; - MultiLevelInv.Current[POW_VULCAN_AMMO] += objp->ctype.powerup_info.count; // add contained ammo so we do not lose this from level when used up - break; case POW_MISSILE_4: case POW_HOMING_AMMO_4: #if defined(DXX_BUILD_DESCENT_II)