From fd8f9fa943f1d7ad7b4f59b9994fd78d48586cbe Mon Sep 17 00:00:00 2001 From: fruitiex Date: Wed, 10 Feb 2010 18:54:42 +0000 Subject: [PATCH] duh... the ramp problem lies not in doublejump, but in the speedcap: fix that. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8630 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 2 +- data/physics10.cfg | 2 +- data/physics11.cfg | 2 +- data/physics151.cfg | 2 +- data/physics151b.cfg | 2 +- data/physics16rc1.cfg | 2 +- data/physics20.cfg | 2 +- data/physics25.cfg | 2 +- data/physics26.cfg | 2 +- data/physicsCPMA.cfg | 2 +- data/physicsHavoc.cfg | 2 +- data/physicsLzd.cfg | 2 +- data/physicsNexrun.cfg | 2 +- data/physicsNexrun_old.cfg | 2 +- data/physicsNoQWBunny.cfg | 2 +- data/physicsQ.cfg | 2 +- data/physicsQ2.cfg | 2 +- data/physicsQ2a.cfg | 2 +- data/physicsQ3.cfg | 2 +- data/physicsQBF.cfg | 2 +- data/physicsQBFplus.cfg | 2 +- data/physicsSamual.cfg | 2 +- data/physicsWarsow.cfg | 2 +- data/physicsWarsowClassicBunny.cfg | 2 +- data/physicsWarsowDev.cfg | 2 +- data/qcsrc/server/cl_physics.qc | 22 +++++++++++----------- 26 files changed, 36 insertions(+), 36 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 3737c47d5..0a5985527 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -330,9 +330,9 @@ set sv_player_crouch_maxs "16 16 25" "maxs of a crouched playermodel" set sv_pogostick 1 "don't require releasing the space bar for jumping again" set sv_doublejump 0 "allow Quake 2-style double jumps" -set sv_doublejump_disable_on_ramps 0 "disable doublejump code on ramps to preserve the old rampjump style" set sv_jumpspeedcap_min "" "wont perform a doublejump if z-axis speed is higher than sv_jumpvelocity * this" set sv_jumpspeedcap_max "" "wont perform a doublejump if z-axis speed is higher than sv_jumpvelocity * this" +set sv_jumpspeedcap_max_disable_on_ramps 0 "disable max jumpspeedcap on ramps to preserve the old rampjump style" seta sv_precacheplayermodels 1 seta sv_precacheweapons 0 diff --git a/data/physics10.cfg b/data/physics10.cfg index c9a73ce0b..80d1013a4 100644 --- a/data/physics10.cfg +++ b/data/physics10.cfg @@ -26,4 +26,4 @@ sv_doublejump 0 // 1.0 did not allow re-jumping due to a bug, this is quite close to it sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physics11.cfg b/data/physics11.cfg index 22676aa4b..b3278b74c 100644 --- a/data/physics11.cfg +++ b/data/physics11.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0.25 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physics151.cfg b/data/physics151.cfg index 4f7a4080c..76513eae2 100644 --- a/data/physics151.cfg +++ b/data/physics151.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physics151b.cfg b/data/physics151b.cfg index bced8c594..eb43d3f3b 100644 --- a/data/physics151b.cfg +++ b/data/physics151b.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physics16rc1.cfg b/data/physics16rc1.cfg index 39c651826..4234d0d19 100644 --- a/data/physics16rc1.cfg +++ b/data/physics16rc1.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0.2 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physics20.cfg b/data/physics20.cfg index c41f6c8a3..7c7c4a00b 100644 --- a/data/physics20.cfg +++ b/data/physics20.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physics25.cfg b/data/physics25.cfg index a05d943a4..8df1375b0 100644 --- a/data/physics25.cfg +++ b/data/physics25.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physics26.cfg b/data/physics26.cfg index 0e1910fa9..19005e958 100644 --- a/data/physics26.cfg +++ b/data/physics26.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsCPMA.cfg b/data/physicsCPMA.cfg index 95d08e333..95b34c25b 100644 --- a/data/physicsCPMA.cfg +++ b/data/physicsCPMA.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsHavoc.cfg b/data/physicsHavoc.cfg index 0a4138e33..7b83e682e 100644 --- a/data/physicsHavoc.cfg +++ b/data/physicsHavoc.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsLzd.cfg b/data/physicsLzd.cfg index f85843480..0349610e3 100644 --- a/data/physicsLzd.cfg +++ b/data/physicsLzd.cfg @@ -26,4 +26,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsNexrun.cfg b/data/physicsNexrun.cfg index c90d1c29b..122c89b02 100644 --- a/data/physicsNexrun.cfg +++ b/data/physicsNexrun.cfg @@ -29,4 +29,4 @@ sv_friction_on_land 0 sv_doublejump 1 sv_jumpspeedcap_min 0 sv_jumpspeedcap_max 1 -sv_doublejump_disable_on_ramps 1 +sv_jumpspeedcap_max_disable_on_ramps 1 diff --git a/data/physicsNexrun_old.cfg b/data/physicsNexrun_old.cfg index b30bf9960..6142cf2fc 100644 --- a/data/physicsNexrun_old.cfg +++ b/data/physicsNexrun_old.cfg @@ -29,4 +29,4 @@ sv_friction_on_land 0 sv_doublejump 1 sv_jumpspeedcap_min 0 sv_jumpspeedcap_max 1 -sv_doublejump_disable_on_ramps 1 +sv_jumpspeedcap_max_disable_on_ramps 1 diff --git a/data/physicsNoQWBunny.cfg b/data/physicsNoQWBunny.cfg index 7db8bb5d0..cb1192980 100644 --- a/data/physicsNoQWBunny.cfg +++ b/data/physicsNoQWBunny.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsQ.cfg b/data/physicsQ.cfg index 1dd7a7798..904f2d7c4 100644 --- a/data/physicsQ.cfg +++ b/data/physicsQ.cfg @@ -26,4 +26,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsQ2.cfg b/data/physicsQ2.cfg index c0ae0b252..ecbd2a3dd 100644 --- a/data/physicsQ2.cfg +++ b/data/physicsQ2.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 1 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsQ2a.cfg b/data/physicsQ2a.cfg index 3a0a22cdf..27d77f374 100644 --- a/data/physicsQ2a.cfg +++ b/data/physicsQ2a.cfg @@ -26,4 +26,4 @@ sv_friction_on_land 0 sv_doublejump 1 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsQ3.cfg b/data/physicsQ3.cfg index ac3f14319..6b8d4c1f8 100644 --- a/data/physicsQ3.cfg +++ b/data/physicsQ3.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsQBF.cfg b/data/physicsQBF.cfg index 9527b0188..2e2d0b5e4 100644 --- a/data/physicsQBF.cfg +++ b/data/physicsQBF.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsQBFplus.cfg b/data/physicsQBFplus.cfg index a676f098a..f64b2be46 100644 --- a/data/physicsQBFplus.cfg +++ b/data/physicsQBFplus.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsSamual.cfg b/data/physicsSamual.cfg index e382e9c2a..f4a184044 100644 --- a/data/physicsSamual.cfg +++ b/data/physicsSamual.cfg @@ -24,4 +24,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsWarsow.cfg b/data/physicsWarsow.cfg index 4ab7e5edf..eeb919bf8 100644 --- a/data/physicsWarsow.cfg +++ b/data/physicsWarsow.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsWarsowClassicBunny.cfg b/data/physicsWarsowClassicBunny.cfg index 5b2bc013d..0a66f4543 100644 --- a/data/physicsWarsowClassicBunny.cfg +++ b/data/physicsWarsowClassicBunny.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/physicsWarsowDev.cfg b/data/physicsWarsowDev.cfg index e50322e5e..4f7fff927 100644 --- a/data/physicsWarsowDev.cfg +++ b/data/physicsWarsowDev.cfg @@ -25,4 +25,4 @@ sv_friction_on_land 0 sv_doublejump 0 sv_jumpspeedcap_min "" sv_jumpspeedcap_max "" -sv_doublejump_disable_on_ramps 0 +sv_jumpspeedcap_max_disable_on_ramps 0 diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc index 35f37e23b..4822b0413 100644 --- a/data/qcsrc/server/cl_physics.qc +++ b/data/qcsrc/server/cl_physics.qc @@ -85,8 +85,14 @@ void PlayerJump (void) if(cvar_string("sv_jumpspeedcap_min") != "") self.velocity_z = max(cvar("sv_jumpvelocity") * cvar("sv_jumpspeedcap_min"), self.velocity_z); - if(cvar_string("sv_jumpspeedcap_max") != "") - self.velocity_z = min(cvar("sv_jumpvelocity") * cvar("sv_jumpspeedcap_max"), self.velocity_z); + if(cvar_string("sv_jumpspeedcap_max") != "") { + if(trace_fraction < 1 && trace_plane_normal_z < 0.98 && cvar("sv_jumpspeedcap_max_disable_on_ramps")) { + // don't do jump speedcaps on ramps to preserve old nexuiz ramjump style + //print("Trace plane normal z: ", ftos(trace_plane_normal_z), ", disabling speed cap!\n"); + } + else + self.velocity_z = min(cvar("sv_jumpvelocity") * cvar("sv_jumpspeedcap_max"), self.velocity_z); + } if(!(self.lastflags & FL_ONGROUND)) { @@ -823,15 +829,9 @@ void SV_PlayerPhysics() if(sv_doublejump) { tracebox(self.origin + '0 0 0.01', self.mins, self.maxs, self.origin - '0 0 0.01', MOVE_NORMAL, self); - if(trace_fraction < 1 && trace_plane_normal_z < 0.98 && cvar("sv_doublejump_disable_on_ramps")) { - // don't do doublejumps on ramps to preserve old nexuiz ramjump style - // print("Trace plane normal z: ", ftos(trace_plane_normal_z), ", disabling dj!\n"); - } - else { // perform doublejump - self.flags &~= FL_ONGROUND; - if(trace_fraction < 1 && trace_plane_normal_z > 0.7) - self.flags |= FL_ONGROUND; - } + self.flags &~= FL_ONGROUND; + if(trace_fraction < 1 && trace_plane_normal_z > 0.7) + self.flags |= FL_ONGROUND; } if (self.BUTTON_JUMP) -- 2.39.2