From 0d8dceea4310fde5706b3ce1c70609d72a38efdf Mon Sep 17 00:00:00 2001 From: John Schoenick Date: Wed, 9 Sep 2015 18:35:41 -0700 Subject: Updated the SDK with the latest code from the TF and HL2 branches. --- mp/src/game/shared/baseplayer_shared.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mp/src/game/shared/baseplayer_shared.cpp') 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; -- cgit v1.2.3