Merge branch 'master' into mirceakitsune/player_cubemaps

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

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index afd2677a66230adbdb9cb41aa297501a20d7c7c2..e70a83c391d7b992ce0091e91efc89504fa31c4d 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -46,6 +46,7 @@ const float TE_CSQC_NEX_SCOPE = 116;
 const float TE_CSQC_MINELAYER_MAXMINES = 117;
 const float TE_CSQC_HAGAR_MAXROCKETS = 118;
 const float TE_CSQC_VEHICLESETUP = 119;
+const float TE_CSQC_SVNOTICE = 120;
 
 const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
 const float RACE_NET_CHECKPOINT_CLEAR = 1;
@@ -551,18 +552,17 @@ string HUD_PANELNAME_INFOMESSAGES = "infomessages";
 string HUD_PANELNAME_PHYSICS   = "physics";
 string HUD_PANELNAME_CENTERPRINT       = "centerprint";
 
-float HUD_MENU_ENABLE          = 0;
-
 #define SERVERFLAG_ALLOW_FULLBRIGHT 1
 #define SERVERFLAG_TEAMPLAY 2
 #define SERVERFLAG_PLAYERSTATS 4
 
-var vector autocvar_sv_player_maxs = '16 16 45';
-var vector autocvar_sv_player_mins = '-16 -16 -24';
-var vector autocvar_sv_player_viewoffset = '0 0 20';
-var vector autocvar_sv_player_crouch_maxs = '16 16 25';
-var vector autocvar_sv_player_crouch_mins = '-16 -16 -24';
-var vector autocvar_sv_player_crouch_viewoffset = '0 0 20';
+// FIXME/EXPLAINME: why?
+noref var vector autocvar_sv_player_maxs = '16 16 45';
+noref var vector autocvar_sv_player_mins = '-16 -16 -24';
+noref var vector autocvar_sv_player_viewoffset = '0 0 20';
+noref var vector autocvar_sv_player_crouch_maxs = '16 16 25';
+noref var vector autocvar_sv_player_crouch_mins = '-16 -16 -24';
+noref var vector autocvar_sv_player_crouch_viewoffset = '0 0 20';
 noref var vector autocvar_sv_player_headsize = '24 24 12';
 
 #define PL_VIEW_OFS autocvar_sv_player_viewoffset
@@ -588,3 +588,13 @@ noref var vector autocvar_sv_player_headsize = '24 24 12';
 #define SPAWN_PRIO_NEAR_TEAMMATE_SAMETEAM 100
 #define SPAWN_PRIO_RACE_PREVIOUS_SPAWN     50
 #define SPAWN_PRIO_GOOD_DISTANCE           10
+
+// URI handles
+#define URI_GET_DISCARD              0
+#define URI_GET_IPBAN                1
+#define URI_GET_IPBAN_END           16
+#define URI_GET_CURL                17
+#define URI_GET_CURL_END            32
+#define URI_GET_UPDATENOTIFICATION  33
+#define URI_GET_URLLIB             128
+#define URI_GET_URLLIB_END         191