Merge branch 'master' into z411/bai-server

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

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 7be53f6dee116b558d6a14a931c7aee72bf5d991..9c9881718dffbb7a0b93c8af9da1265becfe5141 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -2,6 +2,12 @@
 
 #include <common/constants.qh>
 #include <common/weapons/_all.qh>
+#include <common/items/inventory.qh>
+
+// z411
+string hostname_full;
+string motd_permanent;
+int sv_timer_countdown;
 
 bool autocvar_cl_db_saveasdump;
 bool autocvar_cl_spawn_event_particles;
@@ -19,7 +25,8 @@ bool autocvar__hud_showbinds_reload;
 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_in_menu_dialog = true;
+bool autocvar_cl_welcome = true;
+bool autocvar_menu_gamemenu = true;
 
 // Map coordinate base calculations need these
 vector mi_center;
@@ -97,6 +104,7 @@ vector view_origin, view_forward, view_right, view_up;
 
 bool button_zoom;
 bool spectatorbutton_zoom;
+bool observe_blocked;
 bool button_attack2;
 
 float current_viewzoom;
@@ -105,8 +113,9 @@ bool warmup_stage;
 
 string hostname;
 string welcome_msg;
+int srv_minplayers;
+int srv_maxplayers;
 float welcome_msg_menu_check_maxtime;
-bool welcome_msg_force_centerprint;
 void Welcome_Message_Show_Try();
 
 void Fog_Force();
@@ -115,6 +124,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;
@@ -123,7 +134,6 @@ bool vote_waiting_for_me;
 
 float current_zoomfraction;
 
-int cs_project_is_b0rked;
 int vid_width, vid_height;
 float vid_pixelheight;
 
@@ -161,8 +171,16 @@ string GetSpeedUnit(int speed_unit);
 .int enttype; // entity type sent from server
 .int sv_entnum; // entity number sent from server
 
+// z411 accuracy info
+.float accuracy_frags[REGISTRY_MAX(Weapons)];
+.float accuracy_hit[REGISTRY_MAX(Weapons)];
+.float accuracy_cnt_hit[REGISTRY_MAX(Weapons)];
+.float accuracy_cnt_fired[REGISTRY_MAX(Weapons)];
+
 .int team;
 .int team_size;
+.int countrycode;
+.string rank;
 
 int binddb;
 
@@ -175,9 +193,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;
@@ -189,3 +204,4 @@ float serverprevtime, serverdeltatime;
 float ticrate;
 
 int serverflags;
+