Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title

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

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 3b36a12c0ea3bd31701fa330d13ec669e62beed7..0bc85a441db9d6e83570061748ba23efa7a05c9e 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -1,6 +1,8 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+#include "../common/constants.qh"
+
 // --------------------------------------------------------------------------
 // MENU Functionality
 
@@ -99,13 +101,15 @@ float button_zoom;
 float spectatorbutton_zoom;
 float button_attack2;
 
-float activeweapon;
-float switchingweapon;
-float switchweapon;
+int activeweapon;
+int switchingweapon;
+int switchweapon;
 float current_viewzoom;
 float zoomin_effect;
 float warmup_stage;
 
+void Fog_Force();
+
 string getcommandkey(string text, string command);
 
 string vote_called_vote;
@@ -149,4 +153,4 @@ entity entcs_receiver[255]; // 255 is the engine limit on maxclients
 float hud;
 float view_quality;
 int framecount;
-#endif
\ No newline at end of file
+#endif