summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorPaweł Redman <trem.redman@gmail.com>2013-09-07 15:45:45 +0200
committerPaweł Redman <trem.redman@gmail.com>2013-09-07 15:45:45 +0200
commit3cd823565be32d8dcdf8949a5b0f17779cb6ceaa (patch)
treec1b73c16cb3eb4aca8b01417dcb53a9bd2532ce3 /src/game
parenta0c18ddfa816a9c6d47bd0b374cf81b76fc4d5dd (diff)
parent13356a0041b9342b2ef2c3e63bb8b65d67fc49b1 (diff)
Merge branch 'master' of https://github.com/enneract/cuboid
Cleaning up the mess
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_pmove.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 348ff4e..3b53dc9 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -59,7 +59,12 @@ float cpm_pm_airstopaccelerate = 2.5;
//It doesn't need it though, but may feel akward
float cpm_pm_jump_z = 0.5; //CPM: 100/270 (normal jumpvel is 270, doublejump default 100) = 0.37037
//However, that value feels too low and nothing much is acomplished since
- //tremulous human jump default is only 240 ups, meaning half hight.
+ //tremulous human jump default is only 240 ups, meaning half height.
+
+//Clip time for maintaining velocity when clipping. For marauder it's actually equal to the jump
+//repeat rate so we can't modify it to cpm's default. CPM Default is 400 I think, but I placed 200
+//becausemarauder has 200, it's a bit tricky to get used to two different values at once.
+float pm_cliptime = 200;
int c_pmove = 0;
@@ -879,6 +884,7 @@ static qboolean PM_CheckJump( void )
//Adding requires me to multiply by class vel again
}
pm->ps->persistant[PERS_JUMPTIME] = 400;
+ pm->ps->pm_time = pm_cliptime; //clip through walls with the same timer as walljump
}
pm->ps->groundEntityNum = ENTITYNUM_NONE;
@@ -2287,7 +2293,7 @@ static void PM_GroundTrace( void )
qboolean steppedDown = qfalse;
// try to step down
- if( pml.groundPlane != qfalse && PM_PredictStepMove( ) && pm->ps->velocity[ 2 ] > 0.0f )
+ if( pml.groundPlane != qfalse && PM_PredictStepMove( ) && pm->ps->velocity[ 2 ] <= 0.0f )
{
//step down
point[ 0 ] = pm->ps->origin[ 0 ];