TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

In MultiLevelInv_Count, use range_for for powerup-object and StolenItems loops. Also do not set unwanted objects to 0 in switch cases as this is redundant due to initialization at the beginning of the function.

Browse source
This commit is contained in:
zico 2016-02-29 16:13:48 +01:00
parent d5c11c42e4
commit cf512cd368
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
similar/main/multi.cpp
View file

@ -4864,10 +4864,8 @@ void MultiLevelInv_Count(bool initial)
MultiLevelInv = {};
MultiLevelInv.Current = {};
for (objnum_t i = 0; i <= Highest_object_index; i++)
range_for (const auto &&objp, vobjptridx)
{
const auto &&objp = vobjptridx(i);
if (objp->type == OBJ_WEAPON) // keep live bombs in inventory so they will respawn after they're gone
{
auto wid = get_weapon_id(objp);
@ -4927,7 +4925,6 @@ void MultiLevelInv_Count(bool initial)
case POW_GUIDED_MISSILE_4:
case POW_MERCURY_MISSILE_4:
#endif
MultiLevelInv.Current[pid] = 0;
MultiLevelInv.Current[pid-1] += 4;
break;
case POW_PROXIMITY_WEAPON:
@ -4940,8 +4937,7 @@ void MultiLevelInv_Count(bool initial)
MultiLevelInv.Current[pid] += VULCAN_AMMO_AMOUNT; // count the actual ammo
break;
default:
MultiLevelInv.Current[pid] = 0; // All other items either do not exist or we NEVER want to have them respawn. So set those to 0.
break;
break; // All other items either do not exist or we NEVER want to have them respawn.
}
}
@ -5035,7 +5031,7 @@ void MultiLevelInv_Count(bool initial)
#if defined(DXX_BUILD_DESCENT_II)
if (Game_mode & GM_MULTI_ROBOTS) // Add (possible) thief inventory
{
for (int i = 0; i < MAX_STOLEN_ITEMS; i++)
range_for (auto &i, Stolen_items)
{
if (Stolen_items[i] >= MAX_POWERUP_TYPES || Stolen_items[i] == POW_ENERGY || Stolen_items[i] == POW_SHIELD_BOOST)
continue;