From cb9343e13fb6ea1640f202e7798707f3d6c3297f Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 11 Sep 2011 15:59:58 +0200 Subject: [PATCH] get rid of cl_nopogostick, replace it by cl_movement_track_canjump now that the engine can handle it somewhat ok; also add it to the menu --- defaultXonotic.cfg | 1 - qcsrc/menu/xonotic/dialog_settings_input.c | 5 +++++ qcsrc/server/cl_client.qc | 2 ++ qcsrc/server/cl_physics.qc | 2 +- qcsrc/server/defs.qh | 2 +- qcsrc/server/miscfunctions.qc | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 29bf1e0b7..f5bbb5653 100644 --- 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 617b4e95f..3ebcb69f0 100644 --- 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 034a61af7..efb7e3961 100644 --- 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 1ffccefd2..5e5db8656 100644 --- 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 458489d90..abef67463 100644 --- 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 3e5bdf392..d1ead11cb 100644 --- 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) -- 2.39.2