reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-12-28 15:45:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

CWeaponBox::Touch: Fixed a hang when touching a weaponbox if multiple items are packed in a slot

Browse Source
This commit is contained in:
s1lentq 2024-03-31 22:46:06 +07:00
parent 92775824e6
commit a546997723
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
regamedll/dlls/weapons.cpp
View File

@ -1974,6 +1974,7 @@ void CWeaponBox::Touch(CBaseEntity *pOther)
if (!m_rgpPlayerItems[i]) if (!m_rgpPlayerItems[i])
continue; continue;
CBasePlayerItem *pPrev = NULL;
CBasePlayerItem *pItem = m_rgpPlayerItems[i]; CBasePlayerItem *pItem = m_rgpPlayerItems[i];
// have at least one weapon in this slot // have at least one weapon in this slot
@ -2070,13 +2071,13 @@ void CWeaponBox::Touch(CBaseEntity *pOther)
} }
else if (i == GRENADE_SLOT) else if (i == GRENADE_SLOT)
{ {
CBasePlayerWeapon *pGrenade = static_cast<CBasePlayerWeapon *>(m_rgpPlayerItems[i]); CBasePlayerWeapon *pGrenade = static_cast<CBasePlayerWeapon *>(pItem);
if (pGrenade && pGrenade->IsWeapon()) if (pGrenade && pGrenade->IsWeapon())
{ {
int playerGrenades = pPlayer->m_rgAmmo[pGrenade->m_iPrimaryAmmoType]; int playerGrenades = pPlayer->m_rgAmmo[pGrenade->m_iPrimaryAmmoType];
#ifdef REGAMEDLL_FIXES #ifdef REGAMEDLL_FIXES
CBasePlayerItem *pNext = m_rgpPlayerItems[i]->m_pNext; CBasePlayerItem *pNext = pItem->m_pNext;
// Determine the max ammo capacity for the picked-up grenade // Determine the max ammo capacity for the picked-up grenade
int iMaxPickupAmmo = pGrenade->iMaxAmmo1(); int iMaxPickupAmmo = pGrenade->iMaxAmmo1();
@ -2094,7 +2095,11 @@ void CWeaponBox::Touch(CBaseEntity *pOther)
playerGrenades, pGrenade->pszAmmo1(), iMaxPickupAmmo, &givenItem)) playerGrenades, pGrenade->pszAmmo1(), iMaxPickupAmmo, &givenItem))
{ {
// unlink this weapon from the box // unlink this weapon from the box
if (pPrev)
pPrev->m_pNext = pItem = pNext;
else
m_rgpPlayerItems[i] = pItem = pNext; m_rgpPlayerItems[i] = pItem = pNext;
continue; continue;
} }
#else #else
@ -2143,7 +2148,8 @@ void CWeaponBox::Touch(CBaseEntity *pOther)
} }
else else
{ {
auto pNext = m_rgpPlayerItems[i]->m_pNext; CBasePlayerItem *pNext = pItem->m_pNext;
if (pPlayer->AddPlayerItem(pItem)) if (pPlayer->AddPlayerItem(pItem))
{ {
pItem->AttachToPlayer(pPlayer); pItem->AttachToPlayer(pPlayer);
@ -2155,12 +2161,17 @@ void CWeaponBox::Touch(CBaseEntity *pOther)
} }
// unlink this weapon from the box // unlink this weapon from the box
if (pPrev)
pPrev->m_pNext = pNext;
else
m_rgpPlayerItems[i] = pItem = pNext; m_rgpPlayerItems[i] = pItem = pNext;
continue; continue;
} }
bRemove = false; bRemove = false;
pItem = m_rgpPlayerItems[i]->m_pNext; pPrev = pItem;
pItem = pItem->m_pNext;
} }
} }