increased M_MAX_EDICTS to 32768

[xonotic/darkplaces.git] / menu.h

diff --git a/menu.h b/menu.h
index 8bee52fb4934a807af362e128974cb4331568c2a..e4722c7785ce65ac49df0c0022213c91bd97c480 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -22,14 +22,16 @@ 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_MAX_EDICTS   (1 << 11) // should be enough for a menu
+#define M_NAME "menu"
+#define M_MAX_EDICTS   32768 // hopefully won't have to increase this again anytime soon...
 
 enum m_state_e {
        m_none,
        m_main,
        m_demo,
        m_singleplayer,
+       m_transfusion_episode,
+       m_transfusion_skill,
        m_load,
        m_save,
        m_multiplayer,
@@ -38,22 +40,26 @@ enum m_state_e {
        m_video,
        m_keys,
        m_help,
+       m_credits,
        m_quit,
        m_lanconfig,
        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;
 extern char m_return_reason[32];
+void M_Update_Return_Reason(char *s);
 
 /*
 // hard-coded menus
 //
 void M_Init (void);
-void M_Keydown (int key);
+void M_KeyEvent (int key);
 void M_Draw (void);
 void M_ToggleMenu_f (void);
 
@@ -61,7 +67,7 @@ void M_ToggleMenu_f (void);
 // menu prog menu
 //
 void MP_Init (void);
-void MP_Keydown (int key);
+void MP_KeyEvent (int key);
 void MP_Draw (void);
 void MP_ToggleMenu_f (void);
 void MP_Shutdown (void);*/
@@ -69,11 +75,12 @@ void MP_Shutdown (void);*/
 //
 // menu router
 //
+void MR_Init_Commands (void);
 void MR_Init (void);
-void MR_Restart_f (void);
-void (*MR_Keydown) (int key);
-void (*MR_Draw) (void);
-void (*MR_ToggleMenu_f) (void);
-void (*MR_Shutdown) (void);
+void MR_Restart (void);
+extern void (*MR_KeyEvent) (int key, char ascii, qboolean downevent);
+extern void (*MR_Draw) (void);
+extern void (*MR_ToggleMenu_f) (void);
+extern void (*MR_Shutdown) (void);
 #endif