FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reload dropped weapons.

This commit is contained in:
Andrey Akhmichin 2024-02-03 22:58:03 +05:00
parent dd1036a5a0
commit d438dbfe33
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/player.cpp
View File

@ -661,7 +661,7 @@ void CBasePlayer::PackDeadPlayerItems( void )
{ {
int iWeaponRules; int iWeaponRules;
int iAmmoRules; int iAmmoRules;
int i; int i, j;
CBasePlayerWeapon *rgpPackWeapons[MAX_WEAPONS] = {0,}; CBasePlayerWeapon *rgpPackWeapons[MAX_WEAPONS] = {0,};
int iPackAmmo[MAX_AMMO_SLOTS]; int iPackAmmo[MAX_AMMO_SLOTS];
int iPW = 0;// index into packweapons array int iPW = 0;// index into packweapons array
@ -696,16 +696,26 @@ void CBasePlayer::PackDeadPlayerItems( void )
if( m_pActiveItem && pPlayerItem == m_pActiveItem ) if( m_pActiveItem && pPlayerItem == m_pActiveItem )
{ {
// this is the active item. Pack it. // this is the active item. Pack it.
rgpPackWeapons[iPW++] = (CBasePlayerWeapon *)pPlayerItem; rgpPackWeapons[iPW] = (CBasePlayerWeapon *)pPlayerItem;
} }
break; break;
case GR_PLR_DROP_GUN_ALL: case GR_PLR_DROP_GUN_ALL:
rgpPackWeapons[iPW++] = (CBasePlayerWeapon *)pPlayerItem; rgpPackWeapons[iPW] = (CBasePlayerWeapon *)pPlayerItem;
break; break;
default: default:
break; break;
} }
if( rgpPackWeapons[iPW] )
{
// complete the reload.
j = Q_min( rgpPackWeapons[iPW]->iMaxClip() - rgpPackWeapons[iPW]->m_iClip, m_rgAmmo[rgpPackWeapons[iPW]->m_iPrimaryAmmoType] );
// Add them to the clip
rgpPackWeapons[iPW]->m_iClip += j;
m_rgAmmo[rgpPackWeapons[iPW]->m_iPrimaryAmmoType] -= j;
iPW++;
}
pPlayerItem = pPlayerItem->m_pNext; pPlayerItem = pPlayerItem->m_pNext;
} }
} }
@ -790,8 +800,8 @@ void CBasePlayer::PackDeadPlayerItems( void )
iPW++; iPW++;
} }
end:
pWeaponBox->pev->velocity = pev->velocity * 1.2;// weaponbox has player's velocity, then some. pWeaponBox->pev->velocity = pev->velocity * 1.2f;// weaponbox has player's velocity, then some.
} }
RemoveAllItems( TRUE );// now strip off everything that wasn't handled by the code above. RemoveAllItems( TRUE );// now strip off everything that wasn't handled by the code above.
} }