X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=menu.h;h=c1950fc2db58e544aed0b38d3197aab102932b16;hb=ae92f5da727207fbeaeac0fa1f4aded67e47e19a;hp=d26668243f0ea9b25e5c7fa5784f66d421c3be50;hpb=f39fed9f802790e3031eb9aa3e25d37b803116c1;p=xonotic%2Fdarkplaces.git diff --git a/menu.h b/menu.h index d2666824..c1950fc2 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 (1 << 12) // should be enough for a menu enum m_state_e { m_none, @@ -48,7 +47,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 +75,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