get rid of cl_nopogostick, replace it by cl_movement_track_canjump now that the engin...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 29bf1e0b7c2c6bdfdd1538543d409f869f14f23a..f5bbb5653f0e2eb8c23d0c01b7f6d5f510f029d5 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -382,7 +382,6 @@ 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/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c
index 617b4e95f2628837225cf0acee3e44db339be3aa..3ebcb69f0bf355e7e1d7740a5b8a920049d1a94c 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_input.c
+++ b/qcsrc/menu/xonotic/dialog_settings_input.c
@@ -67,5 +67,10 @@ void XonoticInputSettingsTab_fill(entity me)
                        me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "apple_mouse_noaccel", _("Turn off OS mouse acceleration")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", _("\"enter console\" also closes")));
+       me.TR(me);
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_movement_track_canjump", _("Holding jump key keeps jumping")));
+       me.gotoRC(me, me.rows - 1, 0);
+               me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_movement_track_canjump", COMMANDBUTTON_APPLY));
 }
 #endif

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 034a61af73b1986230186afbb85fa28ea48ed74b..efb7e3961b6f059f98e8f488d56a4f5607c51dd1 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -3153,6 +3153,8 @@ void PlayerPostThink (void)
 
        CheatFrame();
 
+       CheckPlayerJump();
+
        if(self.classname == "player") {
                CheckRules_Player();
                UpdateChatBubble();

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 1ffccefd21723d0779e9ed0e466b392c43496f87..5e5db8656b393bf66bccfb3da2a496ae09274a5c 100644 (file)
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -112,7 +112,7 @@ void PlayerJump (void)
                if (!(self.flags & FL_ONGROUND))
                        return;
 
-       if(!sv_pogostick || self.cvar_cl_nopogostick)
+       if(!sv_pogostick || self.cvar_cl_movement_track_canjump)
                if (!(self.flags & FL_JUMPRELEASED))
                        return;
 

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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 3e5bdf392910f87454b6c18c7f00bca134d0d593..d1ead11cbf1f79751c49e1f3bbfad4221e978568 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -616,7 +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");
+       GetCvars_handleFloat(s, f, cvar_cl_movement_track_canjump, "cl_movement_track_canjump");
 
        // fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early)
        if (f > 0)