X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qh;h=c9aa2fb40f8a9e86b105dcf317edc9a49cd63f1d;hb=faa6bfec145154737de2d429eac966bb4f442177;hp=28536c256b017f5f7a0397e86728c90fe0d4682f;hpb=8a390ed02bde47c98a5e6bd47c7eb9b1cb3cd1dc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 28536c256..c9aa2fb40 100644
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -38,16 +38,6 @@ float gametype;
 //.float ctf_state;
 //.float health;
 
-// Constants
-const float COLOR_TEAM_RED = 64;
-const float COLOR_TEAM_BLUE = 208;
-
-const float COLOR_TEAM1       = 4;  // red
-const float COLOR_TEAM2       = 13; // blue
-const float COLOR_TEAM3       = 12; // yellow
-const float COLOR_TEAM4       = 9; // pink
-const float COLOR_SPECTATOR = 1337;
-
 #define FONT_DEFAULT 0
 #define FONT_USER 8
 
@@ -64,6 +54,7 @@ const float COLOR_SPECTATOR = 1337;
 #define SP_CLRATIO -5
 #define SP_PL -6
 #define SP_FRAGS -7
+#define SP_SUM -8
 
 #define SP_SEPARATOR -100
 
@@ -95,6 +86,7 @@ entity teamslots[17];    // 17 teams (including "spectator team")
 .float gotscores;
 .entity owner;
 .float ready;
+.float eliminated;
 
 .void(void) draw;
 .void(void) draw2d;
@@ -137,7 +129,6 @@ void centerprint_generic(float new_id, string strMessage, float duration, float
 #define ALPHA_MIN_VISIBLE 0.003
 
 float armorblockpercent;
-float g_weaponswitchdelay;
 
 //hooks
 float calledhooks;
@@ -146,8 +137,8 @@ float calledhooks;
 
 .float ping, ping_packetloss, ping_movementloss;
 
-float g_balance_grenadelauncher_bouncefactor;
-float g_balance_grenadelauncher_bouncestop;
+float g_balance_mortar_bouncefactor;
+float g_balance_mortar_bouncestop;
 float g_balance_electro_secondary_bouncefactor;
 float g_balance_electro_secondary_bouncestop;
 float g_trueaim_minrange;