Move MultiLevelInv_Count for vulcan/gauss to use fallthrough
This commit is contained in:
parent
a502342654
commit
1d568fa56e
|
@ -4934,6 +4934,12 @@ void MultiLevelInv_Count(bool initial)
|
||||||
auto pid = get_powerup_id(objp);
|
auto pid = get_powerup_id(objp);
|
||||||
switch (pid)
|
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_LASER:
|
||||||
case POW_QUAD_FIRE:
|
case POW_QUAD_FIRE:
|
||||||
case POW_SPREADFIRE_WEAPON:
|
case POW_SPREADFIRE_WEAPON:
|
||||||
|
@ -4964,13 +4970,6 @@ void MultiLevelInv_Count(bool initial)
|
||||||
#endif
|
#endif
|
||||||
MultiLevelInv.Current[pid]++;
|
MultiLevelInv.Current[pid]++;
|
||||||
break;
|
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_MISSILE_4:
|
||||||
case POW_HOMING_AMMO_4:
|
case POW_HOMING_AMMO_4:
|
||||||
#if defined(DXX_BUILD_DESCENT_II)
|
#if defined(DXX_BUILD_DESCENT_II)
|
||||||
|
|
Loading…
Reference in a new issue