MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-04-15 14:02:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix for a crash which occurs when NPCs pick up a weapon the player is already holding

Browse Source
This commit is contained in:
Blixibon 2021-09-25 14:27:11 -05:00
parent 85097e119e
commit f61b933ed3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sp/src/game/server/ai_basenpc.cpp
View File

@ -11495,6 +11495,14 @@ bool CAI_BaseNPC::ChooseEnemy( void )
//========================================================= //=========================================================
void CAI_BaseNPC::PickupWeapon( CBaseCombatWeapon *pWeapon ) void CAI_BaseNPC::PickupWeapon( CBaseCombatWeapon *pWeapon )
{ {
#ifdef MAPBASE
if ( pWeapon->VPhysicsGetObject() && pWeapon->VPhysicsGetObject()->GetGameFlags() & FVPHYSICS_PLAYER_HELD )
{
CBasePlayer *pPlayer = UTIL_GetLocalPlayer();
pPlayer->ForceDropOfCarriedPhysObjects( pWeapon );
}
#endif
pWeapon->OnPickedUp( this ); pWeapon->OnPickedUp( this );
Weapon_Equip( pWeapon ); Weapon_Equip( pWeapon );
m_iszPendingWeapon = NULL_STRING; m_iszPendingWeapon = NULL_STRING;