X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=menu.h;h=c68c4295dd917f24bffc2ea4803fe87be04488b8;hb=e890af0070c3d2cd8be5df86042a939e3d2a4ef4;hp=5e8db63a4c4ac0af767e5305fc4a710376116a30;hpb=ad7963df934abe79c4c9a7a0a184f3fe637109d5;p=xonotic%2Fdarkplaces.git diff --git a/menu.h b/menu.h index 5e8db63a..c68c4295 100644 --- a/menu.h +++ b/menu.h @@ -21,10 +21,6 @@ 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... - enum m_state_e { m_none, m_main, @@ -53,8 +49,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 +58,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 +66,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 +78,10 @@ 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); +extern int (*MR_GetServerListEntryCategory) (const serverlist_entry_t *entry); typedef struct video_resolution_s {