Implement ValveSoftware#797

Author: Bitl

src/game/shared/tf/tf_player_shared.cpp

@@ -12131,6 +12131,15 @@ bool CTFPlayer::CanJump() const
 	if ( m_Shared.InCond( TF_COND_TAUNTING ) )
 		return false;
 
+#ifdef BDSBASE
+	CTFWeaponBase* pActiveWeapon = m_Shared.GetActiveTFWeapon();
+	if (pActiveWeapon)
+	{
+		if (!pActiveWeapon->OwnerCanJump())
+			return false;
+	}
+#endif
+
 	int iNoJump = 0;
 	CALL_ATTRIB_HOOK_INT( iNoJump, no_jump );
 

src/game/shared/tf/tf_weapon_compound_bow.cpp

@@ -651,6 +651,12 @@ void CTFCompoundBow::SetArrowAlight( bool bAlight )
 	}
 }
 
+#ifdef BDSBASE
+bool CTFCompoundBow::OwnerCanJump(void)
+{
+	return GetInternalChargeBeginTime() == 0.f;
+}
+#else
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
@@ -670,3 +676,4 @@ void CTFCompoundBow::SetInternalChargeBeginTime( float flChargeBeginTime )
 
 	BaseClass::SetInternalChargeBeginTime( flChargeBeginTime );
 }
+#endif

src/game/shared/tf/tf_weapon_compound_bow.h

@@ -89,8 +89,12 @@ class CTFCompoundBow : public CTFPipebombLauncher
 
 	void			SetArrowAlight( bool bAlight );
 
+#ifdef BDSBASE
+	bool			OwnerCanJump(void);
+#else
 protected:
 	virtual void	SetInternalChargeBeginTime( float flChargeBeginTime ) OVERRIDE;
+#endif
 
 private:
 #ifdef CLIENT_DLL

src/game/shared/tf/tf_weaponbase.h

@@ -338,6 +338,9 @@ class CTFWeaponBase : public CBaseCombatWeapon, public IHasOwner, public IHasGen
 	void EnableDuck();
 	void DisableDuck();
 
+#ifdef BDSBASE
+	virtual bool OwnerCanJump(void) { return true; }
+#endif
 	virtual bool OwnerCanTaunt( void ) { return true; }
 	virtual bool CanBeCritBoosted( void );
 	bool CanHaveRevengeCrits( void );