X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.h;h=e4722c7785ce65ac49df0c0022213c91bd97c480;hp=883bfb508d40acf7c7e5d2447621ebecbbd96da6;hb=7648e72c56d4161706b4f540063e573ecec3dbba;hpb=71e075efa49758f4fd21831973fb0d8e4d6938c8

diff --git a/menu.h b/menu.h
index 883bfb50..e4722c77 100644
--- a/menu.h
+++ b/menu.h
@@ -23,13 +23,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define M_PROG_FILENAME "menu.dat"
 #define M_NAME	"menu"
-#define M_MAX_EDICTS	(1 << 11) // should be enough for a 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,23 +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_graphics,
-	m_options_colorcontrol
+	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);
 
@@ -62,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);*/
@@ -73,9 +78,9 @@ void MP_Shutdown (void);*/
 void MR_Init_Commands (void);
 void MR_Init (void);
 void MR_Restart (void);
-void (*MR_Keydown) (int key, char ascii);
-void (*MR_Draw) (void);
-void (*MR_ToggleMenu_f) (void);
-void (*MR_Shutdown) (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