Scoreboard: fix field titles sometimes getting compressed to the min width even if...

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

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index a71d72d536dfb7eb930ab763a8f4798327e33a2d..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();
 }
@@ -97,14 +101,18 @@ vector view_origin, view_forward, view_right, view_up;
 
 bool button_zoom;
 bool spectatorbutton_zoom;
+bool observe_blocked;
 bool button_attack2;
 
 float current_viewzoom;
 float zoomin_effect;
 bool warmup_stage;
 
+bool campaign;
 string hostname;
 string welcome_msg;
+int srv_minplayers;
+int srv_maxplayers;
 float welcome_msg_menu_check_maxtime;
 void Welcome_Message_Show_Try();
 
@@ -114,6 +122,8 @@ string _getcommandkey(string text, string command, bool forcename);
 #define getcommandkey(cmd_name, command) _getcommandkey(cmd_name, command, false)
 #define getcommandkey_forcename(cmd_name, command) _getcommandkey(cmd_name, command, true)
 
+void Release_Common_Keys();
+
 string vote_called_vote;
 bool ready_waiting;
 bool ready_waiting_for_me;
@@ -173,9 +183,6 @@ float spectatee_status_changed_time;
 
 #define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1)
 
-// short mapname
-string shortmapname;
-
 // database for misc stuff
 int tempdb;
 int ClientProgsDB;