nullprop/halflife-photomode
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

[HL25] Backport "reload current weapon before dropping it" code

Browse source
This commit is contained in:
Joël Troch 2024-08-28 15:40:56 +02:00
parent e0ba8cebc7
commit 9d4ce15069
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dlls/player.cpp
View file

@ -625,8 +625,20 @@ void CBasePlayer::PackDeadPlayerItems()
case GR_PLR_DROP_GUN_ACTIVE:
if (m_pActiveItem && pPlayerItem == m_pActiveItem)
{
CBasePlayerWeapon* pWeapon = (CBasePlayerWeapon*)pPlayerItem;
int nIndex = iPW++;
// this is the active item. Pack it.
rgpPackWeapons[iPW++] = (CBasePlayerWeapon*)pPlayerItem;
rgpPackWeapons[nIndex] = pWeapon;
// Reload the weapon before dropping it if we have ammo
int j = V_min(pWeapon->iMaxClip() - pWeapon->m_iClip, m_rgAmmo[pWeapon->m_iPrimaryAmmoType]);
// Add them to the clip
pWeapon->m_iClip += j;
m_rgAmmo[pWeapon->m_iPrimaryAmmoType] -= j;
TabulateAmmo();
}
break;