add cvars for world erp and cfm; remove pistons for ODE 0.9 support

[xonotic/darkplaces.git] / menu.h

diff --git a/menu.h b/menu.h
index e4722c7785ce65ac49df0c0022213c91bd97c480..5e8db63a4c4ac0af767e5305fc4a710376116a30 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -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;
@@ -75,12 +76,26 @@ void MP_Shutdown (void);*/
 //
 // 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, 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