[nexuiz-commits] r8630 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Feb 10 13:54:43 EST 2010
Author: fruitiex
Date: 2010-02-10 13:54:42 -0500 (Wed, 10 Feb 2010)
New Revision: 8630
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/physics10.cfg
trunk/data/physics11.cfg
trunk/data/physics151.cfg
trunk/data/physics151b.cfg
trunk/data/physics16rc1.cfg
trunk/data/physics20.cfg
trunk/data/physics25.cfg
trunk/data/physics26.cfg
trunk/data/physicsCPMA.cfg
trunk/data/physicsHavoc.cfg
trunk/data/physicsLzd.cfg
trunk/data/physicsNexrun.cfg
trunk/data/physicsNexrun_old.cfg
trunk/data/physicsNoQWBunny.cfg
trunk/data/physicsQ.cfg
trunk/data/physicsQ2.cfg
trunk/data/physicsQ2a.cfg
trunk/data/physicsQ3.cfg
trunk/data/physicsQBF.cfg
trunk/data/physicsQBFplus.cfg
trunk/data/physicsSamual.cfg
trunk/data/physicsWarsow.cfg
trunk/data/physicsWarsowClassicBunny.cfg
trunk/data/physicsWarsowDev.cfg
trunk/data/qcsrc/server/cl_physics.qc
Log:
duh... the ramp problem lies not in doublejump, but in the speedcap: fix
that.
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/defaultNexuiz.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -330,9 +330,9 @@
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
Modified: trunk/data/physics10.cfg
===================================================================
--- trunk/data/physics10.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physics10.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -26,4 +26,4 @@
// 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
Modified: trunk/data/physics11.cfg
===================================================================
--- trunk/data/physics11.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physics11.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physics151.cfg
===================================================================
--- trunk/data/physics151.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physics151.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physics151b.cfg
===================================================================
--- trunk/data/physics151b.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physics151b.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physics16rc1.cfg
===================================================================
--- trunk/data/physics16rc1.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physics16rc1.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physics20.cfg
===================================================================
--- trunk/data/physics20.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physics20.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physics25.cfg
===================================================================
--- trunk/data/physics25.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physics25.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physics26.cfg
===================================================================
--- trunk/data/physics26.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physics26.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsCPMA.cfg
===================================================================
--- trunk/data/physicsCPMA.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsCPMA.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsHavoc.cfg
===================================================================
--- trunk/data/physicsHavoc.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsHavoc.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsLzd.cfg
===================================================================
--- trunk/data/physicsLzd.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsLzd.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -26,4 +26,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsNexrun.cfg
===================================================================
--- trunk/data/physicsNexrun.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsNexrun.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -29,4 +29,4 @@
sv_doublejump 1
sv_jumpspeedcap_min 0
sv_jumpspeedcap_max 1
-sv_doublejump_disable_on_ramps 1
+sv_jumpspeedcap_max_disable_on_ramps 1
Modified: trunk/data/physicsNexrun_old.cfg
===================================================================
--- trunk/data/physicsNexrun_old.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsNexrun_old.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -29,4 +29,4 @@
sv_doublejump 1
sv_jumpspeedcap_min 0
sv_jumpspeedcap_max 1
-sv_doublejump_disable_on_ramps 1
+sv_jumpspeedcap_max_disable_on_ramps 1
Modified: trunk/data/physicsNoQWBunny.cfg
===================================================================
--- trunk/data/physicsNoQWBunny.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsNoQWBunny.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsQ.cfg
===================================================================
--- trunk/data/physicsQ.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsQ.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -26,4 +26,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsQ2.cfg
===================================================================
--- trunk/data/physicsQ2.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsQ2.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 1
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsQ2a.cfg
===================================================================
--- trunk/data/physicsQ2a.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsQ2a.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -26,4 +26,4 @@
sv_doublejump 1
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsQ3.cfg
===================================================================
--- trunk/data/physicsQ3.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsQ3.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsQBF.cfg
===================================================================
--- trunk/data/physicsQBF.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsQBF.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsQBFplus.cfg
===================================================================
--- trunk/data/physicsQBFplus.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsQBFplus.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsSamual.cfg
===================================================================
--- trunk/data/physicsSamual.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsSamual.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -24,4 +24,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsWarsow.cfg
===================================================================
--- trunk/data/physicsWarsow.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsWarsow.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsWarsowClassicBunny.cfg
===================================================================
--- trunk/data/physicsWarsowClassicBunny.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsWarsowClassicBunny.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/physicsWarsowDev.cfg
===================================================================
--- trunk/data/physicsWarsowDev.cfg 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/physicsWarsowDev.cfg 2010-02-10 18:54:42 UTC (rev 8630)
@@ -25,4 +25,4 @@
sv_doublejump 0
sv_jumpspeedcap_min ""
sv_jumpspeedcap_max ""
-sv_doublejump_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 0
Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc 2010-02-10 18:04:16 UTC (rev 8629)
+++ trunk/data/qcsrc/server/cl_physics.qc 2010-02-10 18:54:42 UTC (rev 8630)
@@ -85,8 +85,14 @@
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 @@
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)
More information about the nexuiz-commits
mailing list