X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qh;h=4dcecb1099ea34bb304ba47d0618d20fb08b5180;hp=8a0e78a0d8126fa7fa78fcca829a5c2af1b1f411;hb=1fc6a514101d999802ee2249fa4f60ef4acc4b0b;hpb=21d066a6d9db0539908d0d05ced5d34b6375bdb1

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 8a0e78a0d..4dcecb109 100644
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -11,6 +11,8 @@ string minimapname;
 
 bool postinit;
 entity gametype;
+// temporary hack
+#define ISGAMETYPE(NAME) (gametype == MAPINFO_TYPE_##NAME)
 
 float FONT_USER = 8;
 
@@ -43,20 +45,24 @@ entity teamslots[17];    // 17 teams (including "spectator team")
 .bool ready;
 .bool eliminated;
 
-.void(entity) draw;
 IntrusiveList g_drawables;
-STATIC_INIT(g_drawables) { g_drawables = IL_NEW(); }
-.void(entity) draw2d;
 IntrusiveList g_drawables_2d;
-STATIC_INIT(g_drawables_2d) { g_drawables_2d = IL_NEW(); }
+IntrusiveList g_radarlinks;
+IntrusiveList g_radaricons;
+STATIC_INIT(main)
+{
+	g_drawables = IL_NEW();
+	g_drawables_2d = IL_NEW();
+	g_radarlinks = IL_NEW();
+	g_radaricons = IL_NEW();
+}
+
+.void(entity) draw;
+.void(entity) draw2d;
 .void(entity) entremove;
 float drawframetime;
 vector view_origin, view_forward, view_right, view_up;
 
-IntrusiveList g_radarlinks;
-STATIC_INIT(g_radarlinks) { g_radarlinks = IL_NEW(); }
-IntrusiveList g_radaricons;
-STATIC_INIT(g_radaricons) { g_radaricons = IL_NEW(); }
 
 bool button_zoom;
 bool spectatorbutton_zoom;
@@ -90,8 +96,8 @@ float camera_roll;
 vector camera_direction;
 
 void centerprint_hud(string strMessage);
-void centerprint_kill(float id);
-void centerprint_generic(float new_id, string strMessage, float duration, float countdown_num);
+void centerprint_kill(int id);
+void centerprint_generic(int new_id, string strMessage, float duration, int countdown_num);
 
 const float ALPHA_MIN_VISIBLE = 0.003;