X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=menu.h;h=2344f44434da5b0338e787db258f8b9d7a297ab7;hb=fa06dd40f48b20d738b6bd604758c81defd76cfd;hp=4cb3e85764b9d8ca8b52c26c4ca4e9f98e89b798;hpb=f9efec5d9bd92a5b614aab549f8b0a009051fbbc;p=xonotic%2Fdarkplaces.git

diff --git a/menu.h b/menu.h
index 4cb3e857..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,
@@ -53,8 +52,7 @@ enum m_state_e {
 };
 
 extern enum m_state_e m_state;
-extern char m_return_reason[32];
-void M_Update_Return_Reason(char *s);
+
 
 /*
 // hard-coded menus
@@ -62,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
@@ -70,9 +68,11 @@ 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
 //
@@ -80,19 +80,24 @@ void MP_Shutdown (void);*/
 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_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
+	double pixelheight; ///< pixel aspect
 }
 video_resolution_t;
-extern video_resolution_t video_resolutions[];
+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