Merge branch 'master' into Mario/physics

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / movetypes.qh

diff --git a/qcsrc/client/movetypes.qh b/qcsrc/client/movetypes.qh
index d3323954681ef846cae7cd4df85cf906e8bd2c59..287226e53b7f918cbf4e788f99bcbf2e7252edb0 100644 (file)
--- a/qcsrc/client/movetypes.qh
+++ b/qcsrc/client/movetypes.qh
@@ -13,7 +13,8 @@
 .float move_bounce_stopspeed;
 .float move_nomonsters; // -1 for MOVE_NORMAL, otherwise a MOVE_ constant
 
-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);