Merge commit '683672ff5de2463c9c29cd27bc96b658e61bac98'

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

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index d2847af00bd7c323d1e439053a72ca002a95c064..aacd41589aae6de1dbdd65a6704f733c6d246e9e 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -20,8 +20,10 @@ var float(float bInputType, float nPrimary, float nSecondary) menu_action;
 // --------------------------------------------------------------------------
 // CTF
 
+#ifdef CTF_EXAMPLE
 void() ctf_menu_show;
 string ctf_temp_1;
+#endif
 
 // --------------------------------------------------------------------------
 // Onslaught
@@ -31,7 +33,6 @@ vector mi_center;
 vector mi_scale;
 // Minimap
 string minimapname;
-float ons_showmap;
 
 // --------------------------------------------------------------------------
 // General stuff
@@ -63,7 +64,7 @@ const float COLOR_SPECTATOR = 1337;
 // --------------------------------------------------------------------------
 // Scoreboard stuff
 
-#define MAX_SBAR_FIELDS 16
+#define MAX_HUD_FIELDS 16
 
 #define SP_END -1
 
@@ -76,13 +77,10 @@ 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 sbar_font;
-float sbar_bigfont;
+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;
 
 string scores_label[MAX_SCORE];
 float scores_flags[MAX_SCORE];
@@ -95,9 +93,7 @@ float teamscores_flags[MAX_SCORE];
 #define IS_DECREASING(x) ( !((x)&SFL_LOWER_IS_BETTER) )
 
 
-vector sbar_fontsize;
-vector sbar_oldfontsize;
-vector sbar_fontsize_spec;
+vector hud_fontsize;
 
 float RANKINGS_RECEIVED_CNT;
 string grecordholder[RANKINGS_CNT];
@@ -119,16 +115,13 @@ vector view_origin, view_angles, view_forward, view_right, view_up;
 float button_zoom;
 float spectatorbutton_zoom;
 float button_attack2;
+
 float activeweapon;
 float current_viewzoom;
 float zoomin_effect;
-float ignore_plus_zoom;
-float ignore_minus_zoom;
 float warmup_stage;
 
 string getcommandkey(string text, string command);
-float sbar_showbinds;
-float sbar_showbinds_limit;
 
 string vote_called_vote;
 float ready_waiting;
@@ -164,5 +157,8 @@ float calledhooks;
 
 .float ping, ping_packetloss, ping_movementloss;
 
-float g_balance_grenadelauncher_secondary_bouncefactor;
-float g_balance_grenadelauncher_secondary_bouncestop;
+float g_balance_grenadelauncher_bouncefactor;
+float g_balance_grenadelauncher_bouncestop;
+float g_balance_electro_secondary_bouncefactor;
+float g_balance_electro_secondary_bouncestop;
+float g_trueaim_minrange;