cvar cl_nopogostick (allows a client to turn off sv_pogostick for itself)

for people who like to cripple themselves

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index f5bbb5653f0e2eb8c23d0c01b7f6d5f510f029d5..29bf1e0b7c2c6bdfdd1538543d409f869f14f23a 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -382,6 +382,7 @@ set sv_player_crouch_mins "-16 -16 -24" "mins of a crouched playermodel"
 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 cl_nopogostick 0 "when set on a client, server's setting of sv_pogostick is ignored (hint: when enabled, try both cl_movement_track_canjump modes)"
 set sv_doublejump 0 "allow Quake 2-style double jumps"
 set sv_jumpspeedcap_min "" "lower bound on the baseline velocity of a jump; final velocity will be >= (jumpheight * min + jumpheight)"
 set sv_jumpspeedcap_max "" "upper bound on the baseline velocity of a jump; final velocity will be <= (jumpheight * max + jumpheight)"

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 1012734302a67f372e1979a78e2bdacbc7498526..b10c88d49d305fb17e2c0bbd788e6402443cc1b8 100644 (file)
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -104,7 +104,7 @@ void PlayerJump (void)
                if (!(self.flags & FL_ONGROUND))
                        return;
 
-       if(!sv_pogostick)
+       if(!sv_pogostick || self.cvar_cl_nopogostick)
                if (!(self.flags & FL_JUMPRELEASED))
                        return;
 

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 6c57cf06dc04e82ba8cb5fb1876c57b98a2206bf..458489d90e1381e0ca3512105410fa04cbd934cf 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -313,6 +313,7 @@ float default_weapon_alpha;
 .float cvar_cl_handicap;
 .float cvar_cl_playerdetailreduction;
 .float cvar_cl_clippedspectating;
+.float cvar_cl_nopogostick;
 
 .string cvar_g_xonoticversion;
 .string cvar_cl_weaponpriority;

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 1c070b08b33fa23606130125cd3ee724a9840b46..3e5bdf392910f87454b6c18c7f00bca134d0d593 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -616,6 +616,7 @@ void GetCvars(float f)
        GetCvars_handleFloatOnce(s, f, cvar_cl_gunalign, "cl_gunalign");
        GetCvars_handleFloat(s, f, cvar_cl_allow_uid2name, "cl_allow_uid2name");
        GetCvars_handleFloat(s, f, cvar_cl_allow_uidtracking, "cl_allow_uidtracking");
+       GetCvars_handleFloat(s, f, cvar_cl_nopogostick, "cl_nopogostick");
 
        // fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early)
        if (f > 0)