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

[HL25] Backport multiplayer live satchel charge limit

Browse source
This commit is contained in:
Joël Troch 2024-08-28 14:20:42 +02:00
parent ae352a633d
commit fd9713612f
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dlls/satchel.cpp
View file

@ -163,7 +163,7 @@ LINK_ENTITY_TO_CLASS(weapon_satchel, CSatchel);
//=========================================================
bool CSatchel::AddDuplicate(CBasePlayerItem* pOriginal)
{
CSatchel* pSatchel;
CSatchel* pSatchel = nullptr;
#ifdef CLIENT_DLL
if (bIsMultiplayer())
@ -173,7 +173,25 @@ bool CSatchel::AddDuplicate(CBasePlayerItem* pOriginal)
{
pSatchel = (CSatchel*)pOriginal;
if (pSatchel->m_chargeReady != 0)
if (pOriginal->m_pPlayer == NULL)
return true;
int nSatchelsInPocket = pSatchel->m_pPlayer->m_rgAmmo[pSatchel->PrimaryAmmoIndex()];
int nNumSatchels = 0;
CBaseEntity* pLiveSatchel = NULL;
while ((pLiveSatchel = UTIL_FindEntityInSphere(pLiveSatchel, pOriginal->m_pPlayer->pev->origin, 4096)) != NULL)
{
if (FClassnameIs(pLiveSatchel->pev, "monster_satchel"))
{
if (pLiveSatchel->pev->owner == pOriginal->m_pPlayer->edict())
{
nNumSatchels++;
}
}
}
if (pSatchel->m_chargeReady != 0 && (nSatchelsInPocket + nNumSatchels) >= SATCHEL_MAX_CARRY)
{
// player has some satchels deployed. Refuse to add more.
return false;