Merge abdfac3a80 into 0565403b15

src/game/shared/tf/tf_weapon_buff_item.cpp

@@ -272,6 +272,14 @@ bool CTFBuffItem::Holster( CBaseCombatWeapon *pSwitchingTo )
 	}
 }
 
+//-----------------------------------------------------------------------------
+// Purpose:
+//-----------------------------------------------------------------------------
+bool CTFBuffItem::CanInspect() const
+{
+    return BaseClass::CanInspect() && !m_bPlayingHorn;
+}
+
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------

src/game/shared/tf/tf_weapon_buff_item.h

@@ -71,6 +71,8 @@ public:
 	void			RaiseFlag( void );
 
 	virtual bool	Holster( CBaseCombatWeapon *pSwitchingTo );
+	
+	virtual bool	CanInspect() const OVERRIDE;
 
 	virtual bool	CanReload( void );
 

src/game/shared/tf/tf_weapon_dragons_fury.cpp

@@ -245,6 +245,11 @@ bool CTFWeaponFlameBall::HasFullCharge() const
 	return pOwner->m_Shared.GetItemChargeMeter( LOADOUT_POSITION_PRIMARY) >= 100.f;
 }
 
+bool CTFWeaponFlameBall::CanInspect() const
+{
+    return BaseClass::CanInspect() && HasFullCharge();
+}
+
 void CTFWeaponFlameBall::ItemPostFrame( void )
 {
 	CTFPlayer *pOwner = ToTFPlayer( GetPlayerOwner() );

src/game/shared/tf/tf_weapon_dragons_fury.h

@@ -54,6 +54,8 @@ public:
 
 	virtual void	OnResourceMeterFilled() OVERRIDE;
 	virtual float	GetMeterMultiplier() const OVERRIDE;
+	
+	virtual bool	CanInspect() const OVERRIDE;
 
 #ifdef GAME_DLL
 	virtual float GetInitialAfterburnDuration() const OVERRIDE { return 0.f; }

src/game/shared/tf/tf_weapon_flamethrower.cpp

@@ -509,6 +509,14 @@ void CTFFlameThrower::UpdateOnRemove( void )
 	BaseClass::UpdateOnRemove();
 }
 
+//-----------------------------------------------------------------------------
+// Purpose:
+//-----------------------------------------------------------------------------
+bool CTFFlameThrower::CanInspect() const
+{
+    return BaseClass::CanInspect() && !IsFiring();
+}
+
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------

src/game/shared/tf/tf_weapon_flamethrower.h

@@ -111,6 +111,8 @@ public:
 	bool			EffectMeterShouldFlash( void );
 
 	virtual bool	Deploy( void ) OVERRIDE;
+	
+	virtual bool	CanInspect() const OVERRIDE;
 
 #if defined( CLIENT_DLL )
 

src/game/shared/tf/tf_weapon_grenadelauncher.cpp

@@ -545,6 +545,16 @@ float CTFGrenadeLauncher::GetChargeMaxTime( void )
 	return GetMortarDetonateTimeLength();
 }
 
+bool CTFGrenadeLauncher::CanInspect() const
+{
+    // we are charging a ball, so don't inspect
+    if ( m_flDetonateTime > gpGlobals->curtime )
+    {
+        return false;
+    }
+
+    return BaseClass::CanInspect();
+}
 
 void CTFGrenadeLauncher::ResetDetonateTime()
 {

src/game/shared/tf/tf_weapon_grenadelauncher.h

@@ -69,6 +69,8 @@ public:
 	virtual bool CanCharge( void );
 	virtual float GetChargeBeginTime( void );
 	virtual float GetChargeMaxTime( void );
+	
+	virtual bool	CanInspect() const OVERRIDE;
 
 	void LaunchGrenade( void );
 

src/game/shared/tf/tf_weaponbase.cpp

@@ -2047,6 +2047,7 @@ bool CTFWeaponBase::ReloadSingly( void )
 		{
 			if ( SendWeaponAnim( ACT_RELOAD_FINISH ) )
 			{
+				m_flTimeFinishReloadSingly = gpGlobals->curtime + SequenceDuration();
 				// We're done, allow primary attack as soon as we like unless we're an energy weapon.
 //				if ( IsEnergyWeapon() )
 //				{
@@ -2549,6 +2550,24 @@ void CTFWeaponBase::HandleInspect()
 	// first time pressing inspecting key
 	if ( !m_bInspecting && pPlayer->IsInspecting() )
 	{
+		// Don't inspect while reloading or zooming. TF_COND_ZOOMED for the Classic
+		if ( IsReloading() || pPlayer->m_Shared.InCond( TF_COND_AIMING ) || pPlayer->m_Shared.InCond( TF_COND_ZOOMED ) )
+		{
+			return;
+		}
+
+		// Don't inspect if the player has just fired
+		if ( gpGlobals->curtime < m_flNextPrimaryAttack )
+		{
+			return;
+		}
+
+		// Don't inspect if the weapon isn't idle after reloading last bullet
+		if ( gpGlobals->curtime < m_flTimeFinishReloadSingly )
+		{
+			return;
+		}
+
 		m_nInspectStage = INSPECT_INVALID;
 		m_flInspectAnimEndTime = -1.f;
 		if ( SendWeaponAnim( GetInspectActivity( INSPECT_START ) ) )

src/game/shared/tf/tf_weaponbase.h

@@ -705,6 +705,8 @@ protected:
 	int				m_iLastCritCheckFrame;
 	int				m_iCurrentSeed;
 	float			m_flLastRapidFireCritCheckTime;
+	
+	float			m_flTimeFinishReloadSingly;
 
 	float			m_flLastDeployTime;