diff options
| author | Roman Tetelman <kevlarman@gmail.com> | 2009-10-03 11:57:00 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:32 +0000 |
| commit | 275c95290dde81f6949d99e8d818db54d7859d88 (patch) | |
| tree | 48862010affa5ea6cc6eef35d1f3b24222782d87 /src/game | |
| parent | ef88523ceb802c22fea0f5ac3744702429dfe650 (diff) | |
* no more marauders on ice (fix for bug i introduced in r238)
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_pmove.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 3ede67f0..0f4b112e 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -765,13 +765,6 @@ static qboolean PM_CheckJump( void ) pm->ps->stats[ STAT_MISC ] > 0 ) return qfalse; - //don't allow walljump for a short while after jumping from the ground - if( BG_ClassHasAbility( pm->ps->stats[ STAT_CLASS ], SCA_WALLJUMPER ) ) - { - pm->ps->pm_flags |= PMF_TIME_WALLJUMP; - pm->ps->pm_time = 200; - } - //can't jump and charge at the same time if( ( pm->ps->weapon == WP_ALEVEL4 ) && pm->ps->stats[ STAT_MISC ] > 0 ) @@ -804,6 +797,13 @@ static qboolean PM_CheckJump( void ) return qfalse; } + //don't allow walljump for a short while after jumping from the ground + if( BG_ClassHasAbility( pm->ps->stats[ STAT_CLASS ], SCA_WALLJUMPER ) ) + { + pm->ps->pm_flags |= PMF_TIME_WALLJUMP; + pm->ps->pm_time = 200; + } + pml.groundPlane = qfalse; // jumping away pml.walking = qfalse; pm->ps->pm_flags |= PMF_JUMP_HELD; |