now compiles on x86_64 successfully (still a crash regarding progs strings to fix...

[xonotic/darkplaces.git] / menu.h

diff --git a/menu.h b/menu.h
index 5ce3c5b6be70529290aa27700387ba289d5b07c0..1dd8e17e7200d0e18cab813fbde91396995cc626 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MENU_H
 
 #define M_PROG_FILENAME "menu.dat"
-#define M_NAME "MENU"
+#define M_NAME "menu"
 #define M_MAX_EDICTS   (1 << 11) // should be enough for a menu
 
 enum m_state_e {
@@ -43,7 +43,9 @@ enum m_state_e {
        m_gameoptions,
        m_slist,
        m_options_effects,
-       m_options_colorcontrol
+       m_options_graphics,
+       m_options_colorcontrol,
+       m_reset
 };
 
 extern enum m_state_e m_state;
@@ -69,9 +71,10 @@ void MP_Shutdown (void);*/
 //
 // menu router
 //
+void MR_Init_Commands (void);
 void MR_Init (void);
 void MR_Restart (void);
-void (*MR_Keydown) (int key);
+void (*MR_Keydown) (int key, char ascii);
 void (*MR_Draw) (void);
 void (*MR_ToggleMenu_f) (void);
 void (*MR_Shutdown) (void);