From 52b895a25cd64999e61f82b29377aef69df0f82c Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 8 Sep 2011 21:21:11 +0200 Subject: [PATCH] cvar cl_nopogostick (allows a client to turn off sv_pogostick for itself) for people who like to cripple themselves --- defaultXonotic.cfg | 1 + qcsrc/server/cl_physics.qc | 2 +- qcsrc/server/defs.qh | 1 + qcsrc/server/miscfunctions.qc | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index f5bbb5653..29bf1e0b7 100644 --- 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 101273430..b10c88d49 100644 --- 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 6c57cf06d..458489d90 100644 --- 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 1c070b08b..3e5bdf392 100644 --- 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) -- 2.39.2