Merge branch 'master' into TimePath/scoreboard_elo

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

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index bed4daa268dc2a4afbe08995d70d7b3930913ca7..ab3758ee8531a2119c555600eb9f7110f5258f99 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -1,5 +1,4 @@
-#ifndef CLIENT_MAIN_H
-#define CLIENT_MAIN_H
+#pragma once
 
 #include <common/constants.qh>
 #include <common/weapons/all.qh>
@@ -7,15 +6,6 @@
 // --------------------------------------------------------------------------
 // MENU Functionality
 
-const float DATABUF_PING = 0;
-#define DATABUF_CAPTURES (1*maxclients)
-#define DATABUF_DEATHS (2*maxclients)
-#define DATABUF_RETURNS (3*maxclients)
-
-#define DATABUF_NEXT (5*maxclients)
-
-void setpredraw(entity this, void(entity) pdfunc);
-
 // --------------------------------------------------------------------------
 // Onslaught
 
@@ -40,39 +30,23 @@ float gametype;
 
 float FONT_USER = 8;
 
-// --------------------------------------------------------------------------
-// Scoreboard stuff
-
-const int MAX_HUD_FIELDS = 16;
 
-const int SP_END = -1;
+vector OFFSET_CURSOR = '0 0 0';
+vector SIZE_CURSOR = '32 32 0';
+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();
 
-const int SP_PING = -2;
-const int SP_NAME = -3;
-const int SP_KDRATIO = -4;
-const int SP_CLRATIO = -5;
-const int SP_PL = -6;
-const int SP_FRAGS = -7;
-const int SP_SUM = -8;
+// --------------------------------------------------------------------------
+// Scoreboard stuff
 
-const int SP_SEPARATOR = -100;
+const int MAX_HUD_FIELDS = MAX_SCORE;
 
-float hud_field[MAX_HUD_FIELDS + 1];
+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;
 
-string scores_label[MAX_SCORE];
-int scores_flags[MAX_SCORE];
-string teamscores_label[MAX_SCORE];
-int teamscores_flags[MAX_SCORE];
-.int scores[MAX_SCORE];
-.float teamscores[MAX_TEAMSCORE];
-
-#define IS_INCREASING(x) ( (x)&SFL_LOWER_IS_BETTER )
-#define IS_DECREASING(x) ( !((x)&SFL_LOWER_IS_BETTER) )
-
-
 vector hud_fontsize;
 
 float RANKINGS_RECEIVED_CNT;
@@ -145,5 +119,3 @@ float hud;
 float view_quality;
 int framecount;
 .float health;
-
-#endif