Merge branch 'terencehill/weapon_panel_fix' into 'master'

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

diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh
index bae23e4f783c381595cb31082ba9f74fdba572c6..00f6017aa06b3bdf4b2143fbd132cd4dac4885e3 100644 (file)
--- a/qcsrc/menu/menu.qh
+++ b/qcsrc/menu/menu.qh
@@ -1,34 +1,16 @@
 #ifndef MENU_H
 #define MENU_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/menudefs.qc"
-    #include "../dpdefs/keycodes.qc"
-    #include "sys-post.qh"
-    #include "config.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../common/util.qh"
-    #include "../common/test.qh"
-    #include "oo/base.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/constants.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/campaign_common.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/counting.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "command/menu_cmd.qh"
-#elif defined(SVQC)
-#endif
+#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
 
@@ -37,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;
@@ -70,4 +52,18 @@ void preMenuDraw(); // this is run before the menu is drawn. You may put some st
 void postMenuDraw(); // this is run just after the menu is drawn (or not). Useful to draw something over everything else.
 
 void m_sync();
-#endif
\ No newline at end of file
+
+// 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