Ensure HasPrimary flag assignation on successful weapon removal

rehlds · Sep 28, 2023 · ca99e7d · ca99e7d
1 parent 108db28
commit ca99e7d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
@@ -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"))
 		{
@@ -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;