X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=menu.h;h=c1950fc2db58e544aed0b38d3197aab102932b16;hb=a9ed1485040d02d386687db1632b49abbe8d7d38;hp=e45af43d3a7b2e31a4aec04df76f49c4b23a1e4d;hpb=812ff6ba44c87de88a410e493b8093033867b12c;p=xonotic%2Fdarkplaces.git

diff --git a/menu.h b/menu.h
index e45af43d..c1950fc2 100644
--- a/menu.h
+++ b/menu.h
@@ -21,11 +21,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MENU_H
 #define MENU_H
 
+#define M_PROG_FILENAME "menu.dat"
+#define M_NAME	"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,
@@ -34,24 +39,62 @@ 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 enum m_state_e m_state;
 extern char m_return_reason[32];
+void M_Update_Return_Reason(char *s);
 
-//
-// menus
+/*
+// 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);
 
+//
+// menu prog menu
+//
+void MP_Init (void);
+void MP_KeyEvent (int key);
+void MP_Draw (void);
+void MP_ToggleMenu_f (void);
+void MP_Shutdown (void);*/
+
+//
+// menu router
+//
+
+void MR_Init_Commands (void);
+void MR_Init (void);
+void MR_Restart (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;
+extern int video_resolutions_count;
+extern video_resolution_t video_resolutions_hardcoded[];
+extern int video_resolutions_hardcoded_count;
 #endif