reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2025-01-28 22:48:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactored RemovePlayerItemEx and Extended DestroyItem in CBasePlayerItem (#864)

Browse Source
This commit is contained in:
Javekson 2023-09-28 13:06:04 +04:00 committed by GitHub
parent ee34b06605
commit d7b44099e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
regamedll/dlls/API/CSPlayer.cpp
View File

@ -217,38 +217,20 @@ EXT_FUNC bool CCSPlayer::RemovePlayerItemEx(const char* pszItemName, bool bRemov
return true; // ammo was reduced, this will be considered a successful result return true; // ammo was reduced, this will be considered a successful result
} }
if (bRemoveAmmo) {
pPlayer->m_rgAmmo[pItem->PrimaryAmmoIndex()] = 0;
}
if (pItem == pPlayer->m_pActiveItem) { if (pItem == pPlayer->m_pActiveItem) {
((CBasePlayerWeapon *)pItem)->RetireWeapon(); ((CBasePlayerWeapon *)pItem)->RetireWeapon();
}
if (pItem->CanHolster() && pItem != pPlayer->m_pActiveItem && !(pPlayer->pev->weapons &(1 << pItem->m_iId))) {
if (bRemoveAmmo) { return true;
pPlayer->m_rgAmmo[ pItem->PrimaryAmmoIndex() ] = 0; }
} }
} }
if (pPlayer->RemovePlayerItem(pItem)) return pItem->DestroyItem();
{
if (FClassnameIs(pItem->pev, "weapon_c4")) {
pPlayer->m_bHasC4 = false;
pPlayer->pev->body = 0;
pPlayer->SetBombIcon(FALSE);
pPlayer->SetProgressBarTime(0);
}
pPlayer->pev->weapons &= ~(1 << pItem->m_iId);
// No more weapon
if ((pPlayer->pev->weapons & ~(1 << WEAPON_SUIT)) == 0) {
pPlayer->m_iHideHUD |= HIDEHUD_WEAPONS;
}
pItem->Kill();
if (!pPlayer->m_rgpPlayerItems[PRIMARY_WEAPON_SLOT]) {
pPlayer->m_bHasPrimary = false;
}
return true;
}
} }
return false; return false;

1
regamedll/dlls/player.cpp
View File

@ -8494,7 +8494,6 @@ void CStripWeapons::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
if (slot == ALL_OTHER_ITEMS) if (slot == ALL_OTHER_ITEMS)
{ {
pPlayer->CSPlayer()->RemovePlayerItem("item_thighpack");
pPlayer->CSPlayer()->RemovePlayerItem("item_longjump"); pPlayer->CSPlayer()->RemovePlayerItem("item_longjump");
pPlayer->CSPlayer()->RemovePlayerItem("item_assaultsuit"); pPlayer->CSPlayer()->RemovePlayerItem("item_assaultsuit");
pPlayer->CSPlayer()->RemovePlayerItem("item_kevlar"); pPlayer->CSPlayer()->RemovePlayerItem("item_kevlar");

19
regamedll/dlls/weapons.cpp
View File

@ -1128,8 +1128,10 @@ void EXT_FUNC CBasePlayerWeapon::__API_HOOK(ItemPostFrame)()
} }
} }
void CBasePlayerItem::DestroyItem() bool CBasePlayerItem::DestroyItem()
{ {
bool success = false;
if (m_pPlayer) if (m_pPlayer)
{ {
// if attached to a player, remove. // if attached to a player, remove.
@ -1137,18 +1139,31 @@ void CBasePlayerItem::DestroyItem()
{ {
#ifdef REGAMEDLL_FIXES #ifdef REGAMEDLL_FIXES
if (m_iId == WEAPON_C4) {
m_pPlayer->m_bHasC4 = false;
m_pPlayer->pev->body = 0;
m_pPlayer->SetBombIcon(FALSE);
m_pPlayer->SetProgressBarTime(0);
}
m_pPlayer->pev->weapons &= ~(1 << m_iId); m_pPlayer->pev->weapons &= ~(1 << m_iId);
// No more weapon // No more weapon
if ((m_pPlayer->pev->weapons & ~(1 << WEAPON_SUIT)) == 0) { if ((m_pPlayer->pev->weapons & ~(1 << WEAPON_SUIT)) == 0) {
m_pPlayer->m_iHideHUD |= HIDEHUD_WEAPONS; m_pPlayer->m_iHideHUD |= HIDEHUD_WEAPONS;
} }
#endif
if (!m_pPlayer->m_rgpPlayerItems[PRIMARY_WEAPON_SLOT]) {
m_pPlayer->m_bHasPrimary = false;
}
#endif
success = true;
} }
} }
Kill(); Kill();
return success;
} }
int CBasePlayerItem::AddToPlayer(CBasePlayer *pPlayer) int CBasePlayerItem::AddToPlayer(CBasePlayer *pPlayer)

2
regamedll/dlls/weapons.h
View File

@ -296,7 +296,7 @@ public:
virtual int iItemSlot() { return 0; } // return 0 to MAX_ITEMS_SLOTS, used in hud virtual int iItemSlot() { return 0; } // return 0 to MAX_ITEMS_SLOTS, used in hud
public: public:
void EXPORT DestroyItem(); bool EXPORT DestroyItem();
void EXPORT DefaultTouch(CBaseEntity *pOther); void EXPORT DefaultTouch(CBaseEntity *pOther);
void EXPORT FallThink(); void EXPORT FallThink();
void EXPORT Materialize(); void EXPORT Materialize();