Add proper cvar for the gameplayfix setting

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 624a581a36f18e773b24c0f862bd43f0d363354b..c6fa7642be5bb988be1c26272d43a86af5fb67e4 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1079,6 +1079,8 @@ sv_gameplayfix_delayprojectiles 0
 sv_gameplayfix_q2airaccelerate 1
 sv_gameplayfix_stepmultipletimes 1
 
+cl_gameplayfix_fixedcheckwatertransition 1
+
 // delay for "kill" to prevent abuse
 set g_balance_kill_delay 2
 set g_balance_kill_antispam 5

diff --git a/qcsrc/client/movetypes.qc b/qcsrc/client/movetypes.qc
index 2e75a1bf87bd12af2854bc1dd5d0ee0d323cac56..88e921cbeace695f5875776708a4da35e0e3cf8d 100644 (file)
--- a/qcsrc/client/movetypes.qc
+++ b/qcsrc/client/movetypes.qc
@@ -92,7 +92,7 @@ void _Movetype_CheckWaterTransition(entity ent) // SV_CheckWaterTransition
        if(!ent.move_watertype)
        {
                // just spawned here
-               if(!autocvar_sv_gameplayfix_fixedcheckwatertransition)
+               if(!autocvar_cl_gameplayfix_fixedcheckwatertransition)
                {
                        ent.move_watertype = contents;
                        ent.move_waterlevel = 1;
@@ -114,7 +114,7 @@ void _Movetype_CheckWaterTransition(entity ent) // SV_CheckWaterTransition
        else
        {
                ent.move_watertype = CONTENT_EMPTY;
-               ent.move_waterlevel = (autocvar_sv_gameplayfix_fixedcheckwatertransition ? 0 : contents);
+               ent.move_waterlevel = (autocvar_cl_gameplayfix_fixedcheckwatertransition ? 0 : contents);
        }
 }
 

diff --git a/qcsrc/client/movetypes.qh b/qcsrc/client/movetypes.qh
index a578e0c91dcc1220fce709e7f1f20f2553c62667..287226e53b7f918cbf4e788f99bcbf2e7252edb0 100644 (file)
--- a/qcsrc/client/movetypes.qh
+++ b/qcsrc/client/movetypes.qh
@@ -13,9 +13,8 @@
 .float move_bounce_stopspeed;
 .float move_nomonsters; // -1 for MOVE_NORMAL, otherwise a MOVE_ constant
 
-// TODO: what to do with this? in Xonotic, we always have it enabled anyway
-// however, it is a server setting which could in theory be disabled...?
-float autocvar_sv_gameplayfix_fixedcheckwatertransition; 
+// should match sv_gameplayfix_fixedcheckwatertransition
+var float autocvar_cl_gameplayfix_fixedcheckwatertransition = 1;
 
 void Movetype_Physics_MatchTicrate(float tr, float sloppy);
 void Movetype_Physics_MatchServer(float sloppy);