Skip to content

Commit ec91e5f

Browse files
committed
1 parent e4f7b9c commit ec91e5f

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

game/quiver/info_changelog.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ Added the following Source SDK Pull Requests:
9393
- #1539: Allow weapons with penetrating bullets to penetrate Medigun shield
9494
- #1540: Fixed on-hit attributes not triggering on friendly disguises
9595
- #1542: Add Convar to Remove print from having cheats on for Achievements
96-
- #1543: Fix mounting of custom content in gameinfo
96+
- #1544: Gamemode prefix check fails when loading map from Workshop
97+
- #1547: Allow ducked air jumping as any class
9798

9899
Details:
99100
- Fixed a bug where the mini-crit damage effect doesn't show up when your shield breaks.

src/game/shared/tf/tf_gamemovement.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,12 +1330,19 @@ bool CTFGameMovement::CheckJumpButton()
13301330
return false;
13311331

13321332
// Check to see if the player is a scout.
1333+
#ifndef BDSBASE
13331334
bool bScout = m_pTFPlayer->GetPlayerClass()->IsClass(TF_CLASS_SCOUT);
1335+
#endif
13341336
bool bAirDash = false;
13351337
bool bOnGround = (player->GetGroundEntity() != NULL);
13361338

13371339
ToggleParachute();
13381340

1341+
#ifdef BDSBASE
1342+
// Cannot jump while ducked and grounded.
1343+
if (player->GetFlags() & FL_DUCKING && bOnGround)
1344+
return false;
1345+
#else
13391346
// Cannot jump will ducked.
13401347
if (player->GetFlags() & FL_DUCKING)
13411348
{
@@ -1345,6 +1352,7 @@ bool CTFGameMovement::CheckJumpButton()
13451352
if (!bAllow)
13461353
return false;
13471354
}
1355+
#endif
13481356

13491357
// Cannot jump while in the unduck transition.
13501358
if ((player->m_Local.m_bDucking && (player->GetFlags() & FL_DUCKING)) || (player->m_Local.m_flDuckJumpTime > 0.0f))

0 commit comments

Comments
 (0)