diff options
| author | John Schoenick <[email protected]> | 2015-09-09 18:35:41 -0700 |
|---|---|---|
| committer | John Schoenick <[email protected]> | 2015-09-09 18:35:41 -0700 |
| commit | 0d8dceea4310fde5706b3ce1c70609d72a38efdf (patch) | |
| tree | c831ef32c2c801a5c5a80401736b52c7b5a528ec /mp/src/game/shared/baseplayer_shared.cpp | |
| parent | Updated the SDK with the latest code from the TF and HL2 branches. (diff) | |
| download | source-sdk-2013-master.tar.xz source-sdk-2013-master.zip | |
Diffstat (limited to 'mp/src/game/shared/baseplayer_shared.cpp')
| -rw-r--r-- | mp/src/game/shared/baseplayer_shared.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mp/src/game/shared/baseplayer_shared.cpp b/mp/src/game/shared/baseplayer_shared.cpp index cba09eb7..70056463 100644 --- a/mp/src/game/shared/baseplayer_shared.cpp +++ b/mp/src/game/shared/baseplayer_shared.cpp @@ -342,7 +342,7 @@ Vector CBasePlayer::EyePosition( ) #ifdef CLIENT_DLL if ( IsObserver() ) { - if ( GetObserverMode() == OBS_MODE_CHASE ) + if ( GetObserverMode() == OBS_MODE_CHASE || GetObserverMode() == OBS_MODE_POI ) { if ( IsLocalPlayer() ) { @@ -1035,7 +1035,7 @@ void CBasePlayer::SelectItem( const char *pstr, int iSubType ) // Make sure the current weapon can be holstered if ( GetActiveWeapon() ) { - if ( !GetActiveWeapon()->CanHolster() ) + if ( !GetActiveWeapon()->CanHolster() && !pItem->ForceWeaponSwitch() ) return; ResetAutoaim( ); @@ -1703,6 +1703,7 @@ void CBasePlayer::CalcObserverView( Vector& eyeOrigin, QAngle& eyeAngles, float& case OBS_MODE_IN_EYE : CalcInEyeCamView( eyeOrigin, eyeAngles, fov ); break; + case OBS_MODE_POI : // PASSTIME case OBS_MODE_CHASE : CalcChaseCamView( eyeOrigin, eyeAngles, fov ); break; |