Skip to content

DropPlayerItem: Ensure HasPrimary flag assignation on successful weapon removal #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s1lentq merged 1 commit into from
Oct 10, 2023
Merged

DropPlayerItem: Ensure HasPrimary flag assignation on successful weapon removal #866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion regamedll/dlls/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8051,8 +8051,10 @@ CBaseEntity *EXT_FUNC CBasePlayer::__API_HOOK(DropPlayerItem)(const char *pszIte
g_pGameRules->GetNextBestWeapon(this, pWeapon);
UTIL_MakeVectors(pev->angles);

#ifndef REGAMEDLL_FIXES
if (pWeapon->iItemSlot() == PRIMARY_WEAPON_SLOT)
m_bHasPrimary = false;
m_bHasPrimary = false; // I may have more than just 1 primary weapon :)
#endif

if (FClassnameIs(pWeapon->pev, "weapon_c4"))
{
Expand Down Expand Up @@ -8122,6 +8124,12 @@ CBaseEntity *EXT_FUNC CBasePlayer::__API_HOOK(DropPlayerItem)(const char *pszIte
return nullptr;
}

#ifdef REGAMEDLL_FIXES
if (!m_rgpPlayerItems[PRIMARY_WEAPON_SLOT]) {
m_bHasPrimary = false; // ensure value assignation on successful weapon removal
}
#endif

if (FClassnameIs(pWeapon->pev, "weapon_c4"))
{
pWeaponBox->m_bIsBomb = true;
Expand Down
⚡