Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

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

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index edb0ce194613e7d71386ff2a7919fdbb231f4922..970a1aa0b73d8fc223884e19518ff8a12ced06c6 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
@@ -81,9 +82,6 @@ float hud_size[MAX_HUD_FIELDS + 1];
 string hud_title[MAX_HUD_FIELDS + 1];
 float hud_num_fields;
 
-float hud_font;
-float hud_bigfont;
-
 string scores_label[MAX_SCORE];
 float scores_flags[MAX_SCORE];
 string teamscores_label[MAX_SCORE];
@@ -96,7 +94,6 @@ float teamscores_flags[MAX_SCORE];
 
 
 vector hud_fontsize;
-vector hud_fontsize_spec;
 
 float RANKINGS_RECEIVED_CNT;
 string grecordholder[RANKINGS_CNT];
@@ -162,3 +159,9 @@ float calledhooks;
 #define HOOK_END      2
 
 .float ping, ping_packetloss, ping_movementloss;
+
+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;