Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'

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

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 83da2d2c84b97126c20723d2d44fc6d046780b09..2294ffd1557b080e7ac8d03f1d54d0613cea1254 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -31,7 +31,6 @@ vector mi_center;
 vector mi_scale;
 // Minimap
 string minimapname;
-float ons_showmap;
 
 // --------------------------------------------------------------------------
 // General stuff
@@ -63,7 +62,7 @@ const float COLOR_SPECTATOR = 1337;
 // --------------------------------------------------------------------------
 // Scoreboard stuff
 
-#define MAX_SBAR_FIELDS 16
+#define MAX_HUD_FIELDS 16
 
 #define SP_END -1
 
@@ -76,13 +75,13 @@ const float COLOR_SPECTATOR = 1337;
 
 #define SP_SEPARATOR -100
 
-float sbar_field[MAX_SBAR_FIELDS + 1];
-float sbar_size[MAX_SBAR_FIELDS + 1];
-string sbar_title[MAX_SBAR_FIELDS + 1];
-float sbar_num_fields;
+float hud_field[MAX_HUD_FIELDS + 1];
+float hud_size[MAX_HUD_FIELDS + 1];
+string hud_title[MAX_HUD_FIELDS + 1];
+float hud_num_fields;
 
-float sbar_font;
-float sbar_bigfont;
+float hud_font;
+float hud_bigfont;
 
 string scores_label[MAX_SCORE];
 float scores_flags[MAX_SCORE];
@@ -95,8 +94,7 @@ float teamscores_flags[MAX_SCORE];
 #define IS_DECREASING(x) ( !((x)&SFL_LOWER_IS_BETTER) )
 
 
-vector sbar_fontsize;
-vector sbar_fontsize_spec;
+vector hud_fontsize;
 
 float RANKINGS_RECEIVED_CNT;
 string grecordholder[RANKINGS_CNT];
@@ -126,8 +124,8 @@ float ignore_minus_zoom;
 float warmup_stage;
 
 string getcommandkey(string text, string command);
-float sbar_showbinds;
-float sbar_showbinds_limit;
+float hud_showbinds;
+float hud_showbinds_limit;
 
 string vote_called_vote;
 float ready_waiting;
@@ -162,3 +160,6 @@ float calledhooks;
 #define HOOK_END      2
 
 .float ping, ping_packetloss, ping_movementloss;
+
+float g_balance_grenadelauncher_secondary_bouncefactor;
+float g_balance_grenadelauncher_secondary_bouncestop;