diff options
| author | Roman Tetelman <kevlarman@gmail.com> | 2009-10-03 11:56:34 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:32 +0000 |
| commit | ef88523ceb802c22fea0f5ac3744702429dfe650 (patch) | |
| tree | 8ce1e34a660fcb063dcf0034628e56c90e9c369b | |
| parent | 034038c8d454d03d78d3e828bd2206b0eb054ecd (diff) | |
* marauder has a timeout after jumping before being able to walljump again
* make SnapVector definition more msvc friendly
| -rw-r--r-- | src/game/bg_pmove.c | 7 | ||||
| -rw-r--r-- | src/qcommon/q_shared.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 79ede29a..3ede67f0 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -765,6 +765,13 @@ 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 ) diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index 82b4f87e..84408371 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -468,7 +468,7 @@ typedef struct { // Snaps the vector to the floor value always, ignoring any weirdness from // snapping negative versus positive numbers -#define Floor(f) ((f) >= 0.f ? (int)(f) : -(int)(-(f))) +#define Floor(fl) ((fl) >= 0.0f ? (int)(fl) : -(int)(-(fl))) #define SnapVector(v) ((v)[0]=Floor((v)[0]),(v)[1]=Floor((v)[1]),(v)[2]=Floor((v)[2])) // just in case you do't want to use the macros |