doxygen comments and config file

[xonotic/darkplaces.git] / menu.h

diff --git a/menu.h b/menu.h
index 6cb0425635c77efd591b7604afe01bde95a82a2b..dd7eed7fcb65d023d65296f60e1d9bcb2b599c3d 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   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,27 @@ 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,
+       m_modlist
 };
 
-extern int  m_serverlist;
 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 +68,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);*/
@@ -70,11 +76,23 @@ 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_KeyEvent) (int key, int ascii, qboolean downevent);
+extern void (*MR_Draw) (void);
+extern void (*MR_ToggleMenu_f) (void);
+extern void (*MR_Shutdown) (void);
+
+typedef struct video_resolution_s
+{
+       const char *type;
+       int width, height;
+       int conwidth, conheight;
+       double pixelheight; ///< pixel aspect
+}
+video_resolution_t;
+extern video_resolution_t video_resolutions[];
 #endif