Merge branch 'DefaultUser/ToS' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / replicate.qh

diff --git a/qcsrc/common/replicate.qh b/qcsrc/common/replicate.qh
index 304cf389e739b8412b226740dca5c4940ced2533..127ee308255ceae7287011f1f3b13e013e916525 100644 (file)
--- a/qcsrc/common/replicate.qh
+++ b/qcsrc/common/replicate.qh
@@ -8,7 +8,7 @@
        bool cvar_cl_allow_uidranking;
        float cvar_cl_autoscreenshot;
        float cvar_cl_autotaunt;
-       float cvar_cl_clippedspectating;
+       bool cvar_cl_clippedspectating;
        int cvar_cl_gunalign;
        float cvar_cl_handicap;
        float cvar_cl_jetpack_jump;
@@ -28,11 +28,11 @@
 #elif defined(SVQC)
        .float cvar_cl_handicap;
        .int cvar_cl_gunalign;
-       .float cvar_cl_clippedspectating;
+       .bool cvar_cl_clippedspectating;
        .float cvar_cl_autoscreenshot;
        .float cvar_cl_jetpack_jump;
        .float cvar_cl_movement_track_canjump;
-       //.float cvar_cl_newusekeysupported;
+       .float cvar_cl_newusekeysupported;
        .float cvar_cl_cts_noautoswitch;
        .bool cvar_cl_weapon_switch_reload;
        .bool cvar_cl_weapon_switch_fallback_to_impulse;
@@ -83,9 +83,9 @@ REPLICATE(cvar_cl_weapon_switch_fallback_to_impulse, bool, "cl_weapon_switch_fal
 float cvar_cl_newusekeysupported;
 REPLICATE(cvar_cl_newusekeysupported, bool, "cl_newusekeysupported");
 */
+// cvar_cl_allow_uidtracking is handled specially on the server
 #ifdef CSQC
-// handled specially on the server
-REPLICATE(cvar_cl_allow_uidtracking, float, "cl_allow_uidtracking");
+REPLICATE(cvar_cl_allow_uidtracking, int, "cl_allow_uidtracking");
 #endif
 
 REPLICATE(cvar_cl_weaponpriority, string, "cl_weaponpriority");