X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.h;h=cef87e2edb630827da03be08f4201807e1626dd9;hb=961d03b211c568fab07a72b494aac3e9dbc6e842;hp=2031fb17347df2c688288c19df431828de8059fc;hpb=d6fb6e3d3eb443499060b44c10bd6647c90e00d6;p=xonotic%2Fdarkplaces.git

diff --git a/menu.h b/menu.h
index 2031fb17..cef87e2e 100644
--- a/menu.h
+++ b/menu.h
@@ -21,49 +21,80 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MENU_H
 #define MENU_H
 
-//
-// the net drivers should just set the apropriate bits in m_activenet,
-// instead of having the menu code look through their internal tables
-//
-#define	MNET_IPX		1
-#define	MNET_TCP		2
+#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,
 	m_setup,
-	m_net,
 	m_options,
 	m_video,
 	m_keys,
 	m_help,
+	m_credits,
 	m_quit,
 	m_lanconfig,
 	m_gameoptions,
-	m_search,
 	m_slist,
 	m_options_effects,
-	m_options_colorcontrol
+	m_options_graphics,
+	m_options_colorcontrol,
+	m_reset,
+	m_modlist
 };
 
-extern int m_activenet;
-extern int m_return_state;
 extern enum m_state_e m_state;
-extern qboolean m_return_onerror;
 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);
+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);
 
+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