Implement ValveSoftware#1130

Author: Bitl

src/game/shared/tf/tf_weapon_buff_item.cpp

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

src/game/shared/tf/tf_weapon_buff_item.h

@@ -72,6 +72,10 @@ class CTFBuffItem : public CTFWeaponBaseMelee
 
 	virtual bool	Holster( CBaseCombatWeapon *pSwitchingTo );
 
+#ifdef BDSBASE
+	virtual bool	CanInspect() const OVERRIDE;
+#endif
+
 	virtual bool	CanReload( void );
 
 	virtual int		GetBuffType() { int iBuffType = 0; CALL_ATTRIB_HOOK_INT( iBuffType, set_buff_type ); return iBuffType; }

src/game/shared/tf/tf_weapon_dragons_fury.cpp

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

src/game/shared/tf/tf_weapon_dragons_fury.h

@@ -55,6 +55,10 @@ class CTFWeaponFlameBall : public CTFFlameThrower
 	virtual void	OnResourceMeterFilled() OVERRIDE;
 	virtual float	GetMeterMultiplier() const OVERRIDE;
 
+#ifdef BDSBASE
+	virtual bool	CanInspect() const OVERRIDE;
+#endif
+
 #ifdef GAME_DLL
 	virtual float GetInitialAfterburnDuration() const OVERRIDE { return 0.f; }
 	void RefundAmmo( int nAmmo );

src/game/shared/tf/tf_weapon_flamethrower.cpp

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

src/game/shared/tf/tf_weapon_flamethrower.h

@@ -112,6 +112,10 @@ class CTFFlameThrower : public CTFWeaponBaseGun
 
 	virtual bool	Deploy( void ) OVERRIDE;
 
+#ifdef BDSBASE
+	virtual bool	CanInspect() const OVERRIDE;
+#endif
+
 #if defined( CLIENT_DLL )
 
 	virtual void	OnDataChanged(DataUpdateType_t updateType) OVERRIDE;

src/game/shared/tf/tf_weapon_grenadelauncher.cpp

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

src/game/shared/tf/tf_weapon_grenadelauncher.h

@@ -70,6 +70,10 @@ class CTFGrenadeLauncher : public CTFWeaponBaseGun, public ITFChargeUpWeapon
 	virtual float GetChargeBeginTime( void );
 	virtual float GetChargeMaxTime( void );
 
+#ifdef BDSBASE
+	virtual bool	CanInspect() const OVERRIDE;
+#endif
+
 	void LaunchGrenade( void );
 
 	void AddDonkVictim( const CBaseEntity* pVictim );

src/game/shared/tf/tf_weaponbase.cpp

@@ -2062,6 +2062,9 @@ bool CTFWeaponBase::ReloadSingly( void )
 		{
 			if ( SendWeaponAnim( ACT_RELOAD_FINISH ) )
 			{
+#ifdef BDSBASE
+				m_flTimeFinishReloadSingly = gpGlobals->curtime + SequenceDuration();
+#endif
 				// We're done, allow primary attack as soon as we like unless we're an energy weapon.
 //				if ( IsEnergyWeapon() )
 //				{
@@ -2591,6 +2594,26 @@ void CTFWeaponBase::HandleInspect()
 	// first time pressing inspecting key
 	if ( !m_bInspecting && pPlayer->IsInspecting() )
 	{
+#ifdef BDSBASE
+		// 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;
+		}
+#endif
+
 		m_nInspectStage = INSPECT_INVALID;
 		m_flInspectAnimEndTime = -1.f;
 		if ( SendWeaponAnim( GetInspectActivity( INSPECT_START ) ) )

src/game/shared/tf/tf_weaponbase.h

@@ -725,6 +725,10 @@ class CTFWeaponBase : public CBaseCombatWeapon, public IHasOwner, public IHasGen
 	int				m_iCurrentSeed;
 	float			m_flLastRapidFireCritCheckTime;
 
+#ifdef BDSBASE
+	float			m_flTimeFinishReloadSingly;
+#endif
+
 	float			m_flLastDeployTime;
 
 	char			m_szTracerName[MAX_TRACER_NAME];