#includes: cleanup

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

diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh
index 6f36a074e05311361c71b174afa796a03adeb02b..6d45ca82f46a36b7f4e64f449275ec36f895a829 100644 (file)
--- a/qcsrc/menu/menu.qh
+++ b/qcsrc/menu/menu.qh
@@ -1,22 +1,28 @@
-#define localcmd cmd
+#ifndef MENU_H
+#define MENU_H
 
-#define NULL (null_entity)
-#define world NULL
+#include "draw.qh"
+#include "skin.qh"
+
+#include "xonotic/util.qh"
+
+#include "../common/constants.qh"
+#include "../common/util.qh"
 
 // 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;
@@ -39,6 +45,8 @@ void postMenuDraw(); // this is run just after the menu is drawn (or not). Usefu
 
 void m_sync();
 
+void draw_reset_cropped();
+
 // sounds
 
 const string MENU_SOUND_CLEAR   = "sound/menu/clear.wav";
@@ -52,3 +60,4 @@ const string MENU_SOUND_WINNER  = "sound/menu/winner.wav";
 
 void m_play_focus_sound();
 void m_play_click_sound(string soundfile);
+#endif