Merge branch 'master' into Mario/ctf_updates

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

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index bcc624d050124571557410d49e0884e476cc4b02..45a65abbe96bd904bae1c3e93007637ba5d8b581 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -1,3 +1,6 @@
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
+
 const int AS_STRING = 1;
 const int AS_INT = 2;
 const int AS_FLOAT_TRUNCATED = 2;
@@ -291,14 +294,14 @@ vector autocvar_sv_player_headsize = '24 24 12';
 #define PL_HEAD autocvar_sv_player_headsize
 
 // helpers
-#define PL_VIEW_OFS_z autocvar_sv_player_viewoffset_z
-#define PL_MIN_z autocvar_sv_player_mins_z
-#define PL_MAX_z autocvar_sv_player_maxs_z
-#define PL_CROUCH_VIEW_OFS_z autocvar_sv_player_crouch_viewoffset_z
-#define PL_CROUCH_MIN_z autocvar_sv_player_mins_z
-#define PL_HEAD_x autocvar_sv_player_headsize_x
-#define PL_HEAD_y autocvar_sv_player_headsize_y
-#define PL_HEAD_z autocvar_sv_player_headsize_z
+#define PL_VIEW_OFS_z autocvar_sv_player_viewoffset.z
+#define PL_MIN_z autocvar_sv_player_mins.z
+#define PL_MAX_z autocvar_sv_player_maxs.z
+#define PL_CROUCH_VIEW_OFS_z autocvar_sv_player_crouch_viewoffset.z
+#define PL_CROUCH_MIN_z autocvar_sv_player_mins.z
+#define PL_HEAD_x autocvar_sv_player_headsize.x
+#define PL_HEAD_y autocvar_sv_player_headsize.y
+#define PL_HEAD_z autocvar_sv_player_headsize.z
 
 // spawnpoint prios
 const int SPAWN_PRIO_NEAR_TEAMMATE_FOUND = 200;
@@ -320,3 +323,4 @@ const int URI_GET_URLLIB_END = 191;
 const int GTV_AVAILABLE = 0;
 // for later use in per-map gametype filtering
 const int GTV_FORBIDDEN = 2;
+#endif