made darkplaces compile successfully with g++ to test for errors C doesn't care about...

[xonotic/darkplaces.git] / menu.h

diff --git a/menu.h b/menu.h
index 04d774c7310c9fa37003fb34c11ece0738bc994f..73adb73887d1d88cb3320df11b3900e9eb5969ce 100644 (file)
--- 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   (1 << 12) // should be enough for a menu
 
 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,16 +40,20 @@ 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
@@ -69,11 +75,12 @@ void MP_Shutdown (void);*/
 //
 // menu router
 //
+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_Keydown) (int key, char ascii);
+extern void (*MR_Draw) (void);
+extern void (*MR_ToggleMenu_f) (void);
+extern void (*MR_Shutdown) (void);
 #endif