Implement ValveSoftware#1133

Author: Bitl

src/game/shared/tf/tf_weapon_sniperrifle.cpp

@@ -323,6 +323,16 @@ void CTFSniperRifle::HandleZooms( void )
 	}
 }
 
+#ifdef BDSBASE
+//-----------------------------------------------------------------------------
+// Purpose:
+//-----------------------------------------------------------------------------
+bool CTFSniperRifle::CanInspect() const
+{
+	return BaseClass::CanInspect() && !IsZoomed() && m_flChargedDamage == 0.f;
+}
+#endif
+
 //-----------------------------------------------------------------------------
 // Purpose:
 //-----------------------------------------------------------------------------
@@ -560,7 +570,11 @@ void CTFSniperRifle::ZoomIn( void )
 
 
 //-----------------------------------------------------------------------------
-bool CTFSniperRifle::IsZoomed( void )
+#ifdef BDSBASE
+bool CTFSniperRifle::IsZoomed(void) const
+#else
+bool CTFSniperRifle::IsZoomed(void)
+#endif
 {
 	CTFPlayer *pPlayer = GetTFPlayerOwner();
 
@@ -1951,6 +1965,12 @@ void CTFSniperRifleClassic::ItemPostFrame( void )
 			// Create the sniper dot.
 			CreateSniperDot();
 			pPlayer->ClearExpression();	
+
+#ifdef BDSBASE
+			// Stop inspecting and reset our animation.
+			StopInspect();
+			SendWeaponAnim(ACT_VM_IDLE);
+#endif
 #endif
 		}
 

src/game/shared/tf/tf_weapon_sniperrifle.h

@@ -117,6 +117,10 @@ class CTFSniperRifle : public CTFWeaponBaseGun
 
 	virtual void WeaponReset( void );
 
+#ifdef BDSBASE
+	virtual bool CanInspect() const OVERRIDE;
+#endif
+
 	virtual bool CanFireCriticalShot( bool bIsHeadshot = false, CBaseEntity *pTarget = NULL ) OVERRIDE;
 
 	virtual void PlayWeaponShootSound( void );
@@ -130,7 +134,11 @@ class CTFSniperRifle : public CTFWeaponBaseGun
 	virtual bool ShouldEjectBrass();
 #endif
 
-	bool IsZoomed( void );
+#ifdef BDSBASE
+	bool IsZoomed(void) const;
+#else
+	bool IsZoomed(void);
+#endif
 	bool IsFullyCharged( void ) const;			// have we been zoomed in long enough for our shot to do max damage
 
 	virtual void OnControlStunned( void );

src/game/shared/tf/tf_weaponbase.cpp

@@ -346,8 +346,12 @@ CTFWeaponBase::CTFWeaponBase()
 	m_eStrangeType = STRANGE_UNKNOWN;
 	m_eStatTrakModuleType = MODULE_UNKNOWN;
 
+#ifdef BDSBASE
+	StopInspect();
+#else
 	m_flInspectAnimEndTime = -1.f;
 	m_nInspectStage = INSPECT_INVALID;
+#endif
 }
 
 CTFWeaponBase::~CTFWeaponBase()
@@ -800,8 +804,12 @@ bool CTFWeaponBase::SendWeaponAnim( int iActivity )
 		// allow other activity to override the inspect
 		if ( !IsInspectActivity( iActivity ) )
 		{
+#ifdef BDSBASE
+			StopInspect();
+#else
 			m_flInspectAnimEndTime = -1.f;
 			m_nInspectStage = INSPECT_INVALID;
+#endif
 			return BaseClass::SendWeaponAnim( iActivity );
 		}
 
@@ -2614,8 +2622,12 @@ void CTFWeaponBase::HandleInspect()
 		}
 #endif
 
-		m_nInspectStage = INSPECT_INVALID;
+#ifdef BDSBASE
+		StopInspect();
+#else
 		m_flInspectAnimEndTime = -1.f;
+		m_nInspectStage = INSPECT_INVALID;
+#endif
 		if ( SendWeaponAnim( GetInspectActivity( INSPECT_START ) ) )
 		{
 			m_flInspectAnimEndTime = gpGlobals->curtime + SequenceDuration();
@@ -2647,8 +2659,12 @@ void CTFWeaponBase::HandleInspect()
 			}
 			else if ( m_nInspectStage == INSPECT_END )
 			{
+#ifdef BDSBASE
+				StopInspect();
+#else
 				m_flInspectAnimEndTime = -1.f;
 				m_nInspectStage = INSPECT_INVALID;
+#endif
 				SendWeaponAnim( ACT_VM_IDLE );
 			}
 		}
@@ -2657,6 +2673,17 @@ void CTFWeaponBase::HandleInspect()
 	m_bInspecting = pPlayer->IsInspecting();
 }
 
+#ifdef BDSBASE
+//-----------------------------------------------------------------------------
+// Purpose:
+//-----------------------------------------------------------------------------
+void CTFWeaponBase::StopInspect()
+{
+	m_flInspectAnimEndTime = -1.f;
+	m_nInspectStage = INSPECT_INVALID;
+}
+#endif
+
 //-----------------------------------------------------------------------------
 // Purpose:
 //-----------------------------------------------------------------------------

src/game/shared/tf/tf_weaponbase.h

@@ -783,6 +783,9 @@ class CTFWeaponBase : public CBaseCombatWeapon, public IHasOwner, public IHasGen
 
 	virtual bool CanInspect() const { return true; }
 	void HandleInspect();
+#ifdef BDSBASE
+	void StopInspect();
+#endif
 
 	virtual void HookAttributes( void ) {};
 	virtual void OnUpgraded( void ) { HookAttributes(); }

src/game/shared/tf/tf_weaponbase_gun.cpp

@@ -1050,6 +1050,12 @@ void CTFWeaponBaseGun::ZoomIn( void )
 	if ( !pPlayer )
 		return;
 
+#ifdef BDSBASE
+	// Stop inspecting and reset our animation.
+	StopInspect();
+	SendWeaponAnim(ACT_VM_IDLE);
+#endif
+
 	// Set the weapon zoom.
 	// TODO: The weapon fov should be gotten from the script file.
 	float fBaseZoom = TF_WEAPON_ZOOM_FOV;