allow bots to use the shortstop shove

Author: Bitl

src/game/server/tf/bot/behavior/tf_bot_behavior.cpp

@@ -22,6 +22,7 @@
 #include "bot/behavior/tf_bot_dead.h"
 #ifdef BDSBASE
 #include "bot/behavior/tf_bot_freeze_input.h"
+#include "tf_weapon_pistol.h"
 #endif
 #include "NextBot/NavMeshEntities/func_nav_prerequisite.h"
 #include "bot/behavior/nav_entities/tf_bot_nav_ent_destroy_entity.h"
@@ -1397,6 +1398,20 @@ void CTFBotMainAction::FireWeaponAtEnemy( CTFBot *me )
 
 		return;
 	}
+#ifdef BDSBASE
+	else if (myWeapon->IsWeapon(TF_WEAPON_HANDGUN_SCOUT_PRIMARY))
+	{
+		CTFPistol_ScoutPrimary* pPistolPrimary = assert_cast<CTFPistol_ScoutPrimary*>(myWeapon);
+		// watch for enemy projectiles heading our way
+		if (pPistolPrimary->CanUsePush() && me->ShouldFireCompressionBlast())
+		{
+			// bounce missiles with compression blast
+			me->PressAltFireButton();
+		}
+
+		return;
+	}
+#endif
 
 	float threatRange = ( threat->GetEntity()->GetAbsOrigin() - me->GetAbsOrigin() ).Length();
 

src/game/server/tf/bot/tf_bot.cpp

@@ -4393,6 +4393,13 @@ bool CTFBot::ShouldFireCompressionBlast( void )
 		}
 	}
 
+#ifdef BDSBASE
+	// if we use the shortstop, we shouldn't try to push enemy projectiles here.
+	CTFWeaponBase* myWeapon = m_Shared.GetActiveTFWeapon();
+
+	if (myWeapon->IsWeapon(TF_WEAPON_HANDGUN_SCOUT_PRIMARY))
+		return false;
+#endif
 
 	Vector vecEye = EyePosition();
 	Vector vecForward, vecRight, vecUp;

src/game/shared/tf/tf_weapon_pistol.cpp

@@ -227,6 +227,11 @@ void CTFPistol_ScoutPrimary::ItemBusyFrame()
 		SecondaryAttack();
 	}
 }
+
+bool CTFPistol_ScoutPrimary::CanUsePush()
+{
+	return (m_flPushTime > -1.f && gpGlobals->curtime > m_flPushTime);
+}
 #endif
 
 //-----------------------------------------------------------------------------
@@ -236,7 +241,11 @@ void CTFPistol_ScoutPrimary::ItemBusyFrame()
 void CTFPistol_ScoutPrimary::ItemPostFrame()
 {
 	// Check for smack.
+#ifdef BDSBASE
+	if (CanUsePush())
+#else
 	if ( m_flPushTime > -1.f && gpGlobals->curtime > m_flPushTime )
+#endif
 	{
 		Push();
 		m_flPushTime = -1.f;

src/game/shared/tf/tf_weapon_pistol.h

@@ -80,6 +80,7 @@ class CTFPistol_ScoutPrimary : public CTFPistol_Scout
 	virtual void	SecondaryAttack( void );
 #ifdef BDSBASE
 	virtual void	ItemBusyFrame();
+	bool			CanUsePush();
 #endif
 	virtual void	ItemPostFrame();
 	virtual bool	Holster( CBaseCombatWeapon *pSwitchingTo );