X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fmenu.qh;h=020a65a20c318ac1cf8f1bbf5e1625759aa30cc2;hb=384be5615d766913a518e828aaeb47540e579ffe;hp=641ddf7d19df20db49ad73d707a74197cf427ad5;hpb=fbec7533403217021a56aad87aae328283178c0f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh
index 641ddf7d1..020a65a20 100644
--- a/qcsrc/menu/menu.qh
+++ b/qcsrc/menu/menu.qh
@@ -1,22 +1,33 @@
-#define localcmd cmd
+#ifndef MENU_H
+#define MENU_H
+
+#include "draw.qh"
+#include "skin.qh"
+
+#include "oo/base.qh"
 
-#define NULL (null_entity)
-#define world NULL
+#include "xonotic/util.qh"
+
+#include "../common/constants.qh"
+#include "../common/test.qh"
+#include "../common/util.qh"
+
+#define localcmd cmd
 
 // 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;
@@ -33,10 +44,25 @@ entity keyGrabber;
 
 float conwidth, conheight; // "virtual" conwidth/height values for other stuff to assume for scaling
 
-void SUB_Null();
-
 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.
 
 void m_sync();
+
+void draw_reset_cropped();
+
+// sounds
+
+const string MENU_SOUND_CLEAR   = "sound/menu/clear.wav";
+const string MENU_SOUND_CLOSE   = "sound/menu/close.wav";
+const string MENU_SOUND_EXECUTE = "sound/menu/execute.wav";
+const string MENU_SOUND_FOCUS   = "sound/menu/focus.wav";
+const string MENU_SOUND_OPEN    = "sound/menu/open.wav";
+const string MENU_SOUND_SELECT  = "sound/menu/select.wav";
+const string MENU_SOUND_SLIDE   = "sound/menu/slide.wav";
+const string MENU_SOUND_WINNER  = "sound/menu/winner.wav";
+
+void m_play_focus_sound();
+void m_play_click_sound(string soundfile);
+#endif