X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=menu.h;h=5e8db63a4c4ac0af767e5305fc4a710376116a30;hb=49ff21dc9c098ef705535f6d5bc9f67cdf509879;hp=a63e62842f5ef41bc79ba5baa35e2212c2f4847e;hpb=5728a70049f5d05ed6bcb6f95d96233efaff6ac5;p=xonotic%2Fdarkplaces.git

diff --git a/menu.h b/menu.h
index a63e6284..5e8db63a 100644
--- a/menu.h
+++ b/menu.h
@@ -23,7 +23,7 @@ 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	(1 << 11) // should be enough for a menu
+#define M_MAX_EDICTS	32768 // hopefully won't have to increase this again anytime soon...
 
 enum m_state_e {
 	m_none,
@@ -48,7 +48,8 @@ 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;
@@ -59,7 +60,7 @@ void M_Update_Return_Reason(char *s);
 // 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);
 
@@ -67,7 +68,7 @@ void M_ToggleMenu_f (void);
 // menu prog menu
 //
 void MP_Init (void);
-void MP_Keydown (int key);
+void MP_KeyEvent (int key);
 void MP_Draw (void);
 void MP_ToggleMenu_f (void);
 void MP_Shutdown (void);*/
@@ -75,12 +76,26 @@ void MP_Shutdown (void);*/
 //
 // menu router
 //
+
 void MR_Init_Commands (void);
 void MR_Init (void);
 void MR_Restart (void);
-void (*MR_Keydown) (int key, char ascii);
-void (*MR_Draw) (void);
-void (*MR_ToggleMenu_f) (void);
-void (*MR_Shutdown) (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_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