X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qh;h=70189b3a23b2a36099f342cfd7f410017f4930c3;hp=e81897362732a3d9b874392952d907c453435d80;hb=675dc579b9e4c98cde79236ed0d2a50a27cb2826;hpb=3bbd344ce0194f454a4bde49ebfce3cb48c06279

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index e81897362..70189b3a2 100644
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -1,13 +1,7 @@
 #pragma once
 
 #include <common/constants.qh>
-#include <common/weapons/all.qh>
-
-// --------------------------------------------------------------------------
-// MENU Functionality
-
-// --------------------------------------------------------------------------
-// Onslaught
+#include <common/weapons/_all.qh>
 
 // Map coordinate base calculations need these
 vector mi_center;
@@ -15,19 +9,9 @@ vector mi_scale;
 // Minimap
 string minimapname;
 
-// --------------------------------------------------------------------------
-// General stuff
-
 float postinit;
 entity gametype;
 
-//float sorted_players;
-//float sorted_teams;
-
-// Defs
-//.float ctf_state;
-//.float health;
-
 float FONT_USER = 8;
 
 
@@ -37,22 +21,12 @@ void draw_cursor(vector pos, vector ofs, string img, vector col, float a);
 void draw_cursor_normal(vector pos, vector col, float a);
 void LoadMenuSkinValues();
 
-// --------------------------------------------------------------------------
-// Scoreboard stuff
-
-const int MAX_HUD_FIELDS = MAX_SCORE;
-
-PlayerScoreField hud_field[MAX_HUD_FIELDS + 1];
-float hud_size[MAX_HUD_FIELDS + 1];
-string hud_title[MAX_HUD_FIELDS + 1];
-int hud_num_fields;
-
 vector hud_fontsize;
 
 float RANKINGS_RECEIVED_CNT;
+float RANKINGS_DISPLAY_CNT;
 string grecordholder[RANKINGS_CNT];
 float grecordtime[RANKINGS_CNT];
-//float csqc_flags;
 
 entity playerslots[255]; // 255 is engine limit on maxclients
 entity teamslots[17];    // 17 teams (including "spectator team")
@@ -80,9 +54,6 @@ bool button_zoom;
 bool spectatorbutton_zoom;
 bool button_attack2;
 
-Weapon activeweapon;
-Weapon switchingweapon;
-Weapon switchweapon;
 float current_viewzoom;
 float zoomin_effect;
 float warmup_stage;
@@ -116,6 +87,7 @@ void centerprint_generic(float new_id, string strMessage, float duration, float
 const float ALPHA_MIN_VISIBLE = 0.003;
 
 float armorblockpercent;
+float damagepush_speedfactor;
 
 //hooks
 int calledhooks;
@@ -126,7 +98,7 @@ const int HOOK_END =      2;
 
 float g_trueaim_minrange;
 
-float hud;
+int hud;
 float view_quality;
 
 int num_spectators;