Merge branch 'master' into Mario/qc_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / menu.qh

diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh
index 6f36a074e05311361c71b174afa796a03adeb02b..00f6017aa06b3bdf4b2143fbd132cd4dac4885e3 100644 (file)
--- a/qcsrc/menu/menu.qh
+++ b/qcsrc/menu/menu.qh
@@ -1,3 +1,17 @@
+#ifndef MENU_H
+#define MENU_H
+
+#include "draw.qh"
+#include "skin.qh"
+
+#include "oo/base.qh"
+
+#include "xonotic/util.qh"
+
+#include "../common/constants.qh"
+#include "../common/test.qh"
+#include "../common/util.qh"
+
 #define localcmd cmd
 
 #define NULL (null_entity)
@@ -5,18 +19,18 @@
 
 // constants
 
-const float GAME_ISSERVER      = 1;
-const float GAME_CONNECTED     = 2;
-const float GAME_DEVELOPER     = 4;
+const int GAME_ISSERVER        = 1;
+const int GAME_CONNECTED       = 2;
+const int GAME_DEVELOPER       = 4;
 
 // prototypes
 
 float Menu_Active;
-float gamestatus;
+int gamestatus;
 
-const float S_SHIFT = 1;
-const float S_CTRL = 2;
-const float S_ALT = 4;
+const int S_SHIFT = 1;
+const int S_CTRL = 2;
+const int S_ALT = 4;
 
 float frametime;
 float time;
@@ -52,3 +66,4 @@ const string MENU_SOUND_WINNER  = "sound/menu/winner.wav";
 
 void m_play_focus_sound();
 void m_play_click_sound(string soundfile);
+#endif