X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=menu.h;h=1ca8799b6bb185ff189f24b5b956822ecef414c6;hb=5bc48d9464fea386c50754dac15fcf0d2c3ad200;hp=7ca77ef35aa73c5ba4dfd458286ee34381da67aa;hpb=144f44c523edfab569e960288dd6d84ad7f4d5f4;p=xonotic%2Fdarkplaces.git

diff --git a/menu.h b/menu.h
index 7ca77ef3..1ca8799b 100644
--- a/menu.h
+++ b/menu.h
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #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...
 
 enum m_state_e {
 	m_none,
@@ -53,8 +52,8 @@ enum m_state_e {
 };
 
 extern enum m_state_e m_state;
-extern char m_return_reason[32];
-void M_Update_Return_Reason(char *s);
+extern char m_return_reason[128];
+void M_Update_Return_Reason(const char *s);
 
 /*
 // hard-coded menus
@@ -62,7 +61,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,7 +69,7 @@ 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);*/
 
 //
@@ -82,8 +81,9 @@ 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_ToggleMenu) (int mode);
 extern void (*MR_Shutdown) (void);
+extern void (*MR_NewMap) (void);
 
 typedef struct video_resolution_s
 {
@@ -95,5 +95,7 @@ typedef struct video_resolution_s
 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