Merge branch 'bones_was_here/q1bsp_hitbox' into 'master'

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

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 00dd149638de748bb50cf927b89ec9e20a2c5f92..34c8fc63be8bc5f08459b62e043275e0eccf6cc5 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -20,6 +20,7 @@ bool autocvar_developer_csqcentities;
 bool autocvar_cl_race_cptimes_onlyself; // TODO: move to race gamemode
 bool autocvar_cl_race_cptimes_showself = false;
 bool autocvar_cl_welcome = true;
+bool autocvar_menu_gamemenu = true;
 
 // Map coordinate base calculations need these
 vector mi_center;
@@ -29,6 +30,7 @@ string minimapname;
 
 bool postinit;
 entity gametype;
+string gametype_custom_name;
 // temporary hack
 #define ISGAMETYPE(NAME) (gametype == MAPINFO_TYPE_##NAME)
 
@@ -77,12 +79,14 @@ entity teamslots[17];    // 17 teams (including "spectator team")
 
 IntrusiveList g_drawables;
 IntrusiveList g_drawables_2d;
+IntrusiveList g_damagetext;
 IntrusiveList g_radarlinks;
 IntrusiveList g_radaricons;
 STATIC_INIT(main)
 {
        g_drawables = IL_NEW();
        g_drawables_2d = IL_NEW();
+       g_damagetext = IL_NEW();
        g_radarlinks = IL_NEW();
        g_radaricons = IL_NEW();
 }
@@ -104,6 +108,7 @@ float current_viewzoom;
 float zoomin_effect;
 bool warmup_stage;
 
+bool campaign;
 string hostname;
 string welcome_msg;
 int srv_minplayers;