X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fmenu.qh;h=2df331950848c1dcdab9c53b63d9ebd553a3cb9a;hb=3ac61b98c83be079c61cf525491d2028b2a889dc;hp=6f36a074e05311361c71b174afa796a03adeb02b;hpb=8e00706d264cb8feb2b636af1587008723ab587a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh
index 6f36a074e..2df331950 100644
--- a/qcsrc/menu/menu.qh
+++ b/qcsrc/menu/menu.qh
@@ -1,22 +1,23 @@
-#define localcmd cmd
+#pragma once
 
-#define NULL (null_entity)
-#define world NULL
+#include "draw.qh"
+#include "skin.qh"
 
-// constants
+#include "xonotic/util.qh"
 
-const float GAME_ISSERVER 	= 1;
-const float GAME_CONNECTED	= 2;
-const float GAME_DEVELOPER	= 4;
+#include <common/constants.qh>
+#include <common/util.qh>
 
-// prototypes
+const int GAME_ISSERVER     = BIT(0);
+const int GAME_CONNECTED    = BIT(1);
+const int GAME_DEVELOPER    = BIT(2);
 
-float Menu_Active;
-float gamestatus;
+bool Menu_Active;
+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;
@@ -29,17 +30,21 @@ void m_goto(string name);
 .string name;
 
 entity keyGrabber;
-.void(entity me, float key, float ascii) keyGrabbed;
+.void(entity this, float key, float ascii) keyGrabbed;
 
-float conwidth, conheight; // "virtual" conwidth/height values for other stuff to assume for scaling
+// "virtual" conwidth/height values for other stuff to assume for scaling
+float conwidth, conheight;
 
-float preMenuInit(); // you have to define this for pre-menu initialization. Return 0 if initialization needs to be retried a frame later, 1 if it succeeded.
-void preMenuDraw(); // this is run before the menu is drawn. You may put some stuff there that has to be done every frame.
-void postMenuDraw(); // this is run just after the menu is drawn (or not). Useful to draw something over everything else.
+/** you have to define this for pre-menu initialization. Return 0 if initialization needs to be retried a frame later, 1 if it succeeded. */
+float preMenuInit();
+/** this is run before the menu is drawn. You may put some stuff there that has to be done every frame. */
+void preMenuDraw();
+/** this is run just after the menu is drawn (or not). Useful to draw something over everything else. */
+void postMenuDraw();
 
 void m_sync();
 
-// sounds
+void draw_reset_cropped();
 
 const string MENU_SOUND_CLEAR   = "sound/menu/clear.wav";
 const string MENU_SOUND_CLOSE   = "sound/menu/close.wav";