X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=menu.h;h=38a034f6629b1d419dbc6b996bca5c025e184e31;hb=HEAD;hp=e4722c7785ce65ac49df0c0022213c91bd97c480;hpb=7648e72c56d4161706b4f540063e573ecec3dbba;p=xonotic%2Fdarkplaces.git

diff --git a/menu.h b/menu.h
index e4722c77..2344f444 100644
--- a/menu.h
+++ b/menu.h
@@ -21,9 +21,8 @@ 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"
-#define M_MAX_EDICTS	32768 // hopefully won't have to increase this again anytime soon...
+#include "qtypes.h"
+struct serverlist_entry_s;
 
 enum m_state_e {
 	m_none,
@@ -48,12 +47,12 @@ enum m_state_e {
 	m_options_effects,
 	m_options_graphics,
 	m_options_colorcontrol,
-	m_reset
+	m_reset,
+	m_modlist
 };
 
 extern enum m_state_e m_state;
-extern char m_return_reason[32];
-void M_Update_Return_Reason(char *s);
+
 
 /*
 // hard-coded menus
@@ -61,7 +60,7 @@ void M_Update_Return_Reason(char *s);
 void M_Init (void);
 void M_KeyEvent (int key);
 void M_Draw (void);
-void M_ToggleMenu_f (void);
+void M_ToggleMenu (int mode);
 
 //
 // menu prog menu
@@ -69,18 +68,36 @@ void M_ToggleMenu_f (void);
 void MP_Init (void);
 void MP_KeyEvent (int key);
 void MP_Draw (void);
-void MP_ToggleMenu_f (void);
+void MP_ToggleMenu (int mode);
 void MP_Shutdown (void);*/
 
+qbool MP_ConsoleCommand(const char *text, size_t textlen);
+
 //
 // menu router
 //
+
 void MR_Init_Commands (void);
 void MR_Init (void);
 void MR_Restart (void);
-extern void (*MR_KeyEvent) (int key, char ascii, qboolean downevent);
+extern void (*MR_KeyEvent) (int key, int ascii, qbool downevent);
 extern void (*MR_Draw) (void);
-extern void (*MR_ToggleMenu_f) (void);
+extern void (*MR_ToggleMenu) (int mode);
 extern void (*MR_Shutdown) (void);
+extern void (*MR_NewMap) (void);
+extern int (*MR_GetServerListEntryCategory) (const struct serverlist_entry_s *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