X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.h;h=c68c4295dd917f24bffc2ea4803fe87be04488b8;hb=7a6273c95a958a24ee0016e389a4173028604491;hp=e45af43d3a7b2e31a4aec04df76f49c4b23a1e4d;hpb=812ff6ba44c87de88a410e493b8093033867b12c;p=xonotic%2Fdarkplaces.git

diff --git a/menu.h b/menu.h
index e45af43d..c68c4295 100644
--- a/menu.h
+++ b/menu.h
@@ -26,6 +26,8 @@ enum m_state_e {
 	m_main,
 	m_demo,
 	m_singleplayer,
+	m_transfusion_episode,
+	m_transfusion_skill,
 	m_load,
 	m_save,
 	m_multiplayer,
@@ -34,24 +36,64 @@ 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];
+extern char m_return_reason[128];
+void M_Update_Return_Reason(const 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);
+void M_ToggleMenu (int mode);
+
+//
+// menu prog menu
+//
+void MP_Init (void);
+void MP_KeyEvent (int key);
+void MP_Draw (void);
+void MP_ToggleMenu (int mode);
+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) (int mode);
+extern void (*MR_Shutdown) (void);
+extern void (*MR_NewMap) (void);
+extern int (*MR_GetServerListEntryCategory) (const serverlist_entry_t *entry);
 
+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