MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-01-28 22:57:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed metrocop unholster behavior

Browse Source
This commit is contained in:
Blixibon 2021-10-18 11:37:06 -05:00
parent 3cd6f2e581
commit a5c0091588
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sp/src/game/server/hl2/npc_metropolice.cpp
View File

@ -1537,7 +1537,12 @@ void CNPC_MetroPolice::OnUpdateShotRegulator( )
BaseClass::OnUpdateShotRegulator(); BaseClass::OnUpdateShotRegulator();
// FIXME: This code (except the burst interval) could be used for all weapon types // FIXME: This code (except the burst interval) could be used for all weapon types
#ifdef MAPBASE
// Only if we actually have the pistol out
if ( EntIsClass( GetActiveWeapon(), gm_isz_class_Pistol ) )
#else
if( Weapon_OwnsThisType( "weapon_pistol" ) ) if( Weapon_OwnsThisType( "weapon_pistol" ) )
#endif
{ {
if ( m_nBurstMode == BURST_NOT_ACTIVE ) if ( m_nBurstMode == BURST_NOT_ACTIVE )
{ {
@ -3900,9 +3905,9 @@ int CNPC_MetroPolice::SelectScheduleNoDirectEnemy()
} }
#ifdef MAPBASE #ifdef MAPBASE
// If you see your enemy and your weapon is holstered, you're probably about to arm yourself. // If you see your enemy and you're still arming yourself, wait and don't just charge in
// Wait and don't just charge in // (if your weapon is holstered, you're probably about to arm yourself)
if ( IsWeaponHolstered() && HasCondition(COND_SEE_ENEMY) ) if ( HasCondition( COND_SEE_ENEMY ) && (IsWeaponHolstered() || FindGestureLayer( TranslateActivity( ACT_ARM ) )) )
{ {
return SCHED_COMBAT_FACE; return SCHED_COMBAT_FACE;
} }