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

Fold newdemo_record_primary_ammo in draw_hud

Browse source
This commit is contained in:
Kp 2016-07-14 01:59:04 +00:00
parent 3894c66b9b
commit dcdff564f4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
similar/main/gauges.cpp
View file

@ -3134,12 +3134,14 @@ void draw_hud()
{ {
if (Newdemo_state == ND_STATE_RECORDING) if (Newdemo_state == ND_STATE_RECORDING)
{ {
if (Primary_weapon == primary_weapon_index_t::VULCAN_INDEX) int ammo;
newdemo_record_primary_ammo(get_local_player_vulcan_ammo()); if ((Primary_weapon == primary_weapon_index_t::VULCAN_INDEX && (ammo = get_local_player_vulcan_ammo(), true))
#if defined(DXX_BUILD_DESCENT_II) #if defined(DXX_BUILD_DESCENT_II)
if (Primary_weapon == primary_weapon_index_t::OMEGA_INDEX) ||
newdemo_record_primary_ammo(Omega_charge); (Primary_weapon == primary_weapon_index_t::OMEGA_INDEX && (ammo = Omega_charge, true))
#endif #endif
)
newdemo_record_primary_ammo(ammo);
newdemo_record_secondary_ammo(get_local_player_secondary_ammo()[Secondary_weapon]); newdemo_record_secondary_ammo(get_local_player_secondary_ammo()[Secondary_weapon]);
} }
if (PlayerCfg.HudMode == HudType::Hidden) // no hud, "immersion mode" if (PlayerCfg.HudMode == HudType::Hidden) // no hud, "immersion mode"