static int NehGameType;
enum m_state_e m_state;
-char m_return_reason[32];
+char m_return_reason[128];
void M_Menu_Main_f (void);
void M_Menu_SinglePlayer_f (void);
static void M_ModList_Draw (void);
-static void M_Main_Key (int key, char ascii);
- static void M_SinglePlayer_Key (int key, char ascii);
- static void M_Transfusion_Episode_Key (int key, char ascii);
- static void M_Transfusion_Skill_Key (int key, char ascii);
- static void M_Load_Key (int key, char ascii);
- static void M_Save_Key (int key, char ascii);
- static void M_MultiPlayer_Key (int key, char ascii);
- static void M_Setup_Key (int key, char ascii);
- static void M_Options_Key (int key, char ascii);
- static void M_Options_Effects_Key (int key, char ascii);
- static void M_Options_Graphics_Key (int key, char ascii);
- static void M_Options_ColorControl_Key (int key, char ascii);
- static void M_Keys_Key (int key, char ascii);
- static void M_Reset_Key (int key, char ascii);
- static void M_Video_Key (int key, char ascii);
- static void M_Help_Key (int key, char ascii);
- static void M_Credits_Key (int key, char ascii);
- static void M_Quit_Key (int key, char ascii);
-static void M_LanConfig_Key (int key, char ascii);
-static void M_GameOptions_Key (int key, char ascii);
-static void M_ServerList_Key (int key, char ascii);
-static void M_ModList_Key (int key, char ascii);
-
-static qboolean m_entersound; // play after drawing a frame, so caching won't disrupt the sound
-
-void M_Update_Return_Reason(char *s)
+static void M_Main_Key (int key, int ascii);
+ static void M_SinglePlayer_Key (int key, int ascii);
+ static void M_Transfusion_Episode_Key (int key, int ascii);
+ static void M_Transfusion_Skill_Key (int key, int ascii);
+ static void M_Load_Key (int key, int ascii);
+ static void M_Save_Key (int key, int ascii);
+ static void M_MultiPlayer_Key (int key, int ascii);
+ static void M_Setup_Key (int key, int ascii);
+ static void M_Options_Key (int key, int ascii);
+ static void M_Options_Effects_Key (int key, int ascii);
+ static void M_Options_Graphics_Key (int key, int ascii);
+ static void M_Options_ColorControl_Key (int key, int ascii);
+ static void M_Keys_Key (int key, int ascii);
+ static void M_Reset_Key (int key, int ascii);
+ static void M_Video_Key (int key, int ascii);
+ static void M_Help_Key (int key, int ascii);
+ static void M_Credits_Key (int key, int ascii);
+ static void M_Quit_Key (int key, int ascii);
+static void M_LanConfig_Key (int key, int ascii);
+static void M_GameOptions_Key (int key, int ascii);
+static void M_ServerList_Key (int key, int ascii);
+static void M_ModList_Key (int key, int ascii);
+
+static qboolean m_entersound; ///< play after drawing a frame, so caching won't disrupt the sound
+
+void M_Update_Return_Reason(const char *s)
{
strlcpy(m_return_reason, s, sizeof(m_return_reason));
if (s)
- Con_Printf("%s\n", s);
+ Con_DPrintf("%s\n", s);
}
#define StartingGame (m_multiplayer_cursor == 1)
#define NumberOfNehahraDemos 34
typedef struct nehahrademonames_s
{
- char *name;
- char *desc;
+ const char *name;
+ const char *desc;
} nehahrademonames_t;
static nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
static void M_Background(int width, int height)
{
- menu_width = bound(1, width, vid_conwidth.integer);
- menu_height = bound(1, height, vid_conheight.integer);
+ menu_width = bound(1.0f, (float)width, vid_conwidth.value);
+ menu_height = bound(1.0f, (float)height, vid_conheight.value);
menu_x = (vid_conwidth.integer - menu_width) * 0.5;
menu_y = (vid_conheight.integer - menu_height) * 0.5;
//DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
char temp[2];
temp[0] = num;
temp[1] = 0;
- DrawQ_String_Font(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
}
static void M_PrintColored(float cx, float cy, const char *str)
{
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
}
static void M_Print(float cx, float cy, const char *str)
{
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
}
static void M_PrintRed(float cx, float cy, const char *str)
{
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
}
static void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
{
if (unghosted)
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
else
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true, FONT_MENU);
}
static void M_DrawPic(float cx, float cy, const char *picname)
/*
================
-M_ToggleMenu_f
+M_ToggleMenu
================
*/
-void M_ToggleMenu_f (void)
+void M_ToggleMenu(int mode)
{
m_entersound = true;
if ((key_dest != key_menu && key_dest != key_menu_grabbed) || m_state != m_main)
{
- if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "1"))
- return;
+ if(mode == 0)
+ return; // the menu is off, and we want it off
M_Menu_Main_f ();
}
else
{
- if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "0"))
- return;
+ if(mode == 1)
+ return; // the menu is on, and we want it on
key_dest = key_game;
m_state = m_none;
}
}
-static void M_Demo_Key (int k, char ascii)
+static void M_Demo_Key (int k, int ascii)
{
switch (k)
{
{
const char *s;
s = "gfx/mainmenu";
+
if (gamemode == GAME_NEHAHRA)
{
+ if (FS_FileExists("maps/neh1m4.bsp"))
+ {
+ if (FS_FileExists("hearing.dem"))
+ {
+ Con_DPrint("Main menu: Nehahra movie and game detected.\n");
+ NehGameType = TYPE_BOTH;
+ }
+ else
+ {
+ Con_DPrint("Nehahra game detected.\n");
+ NehGameType = TYPE_GAME;
+ }
+ }
+ else
+ {
+ if (FS_FileExists("hearing.dem"))
+ {
+ Con_DPrint("Nehahra movie detected.\n");
+ NehGameType = TYPE_DEMO;
+ }
+ else
+ {
+ Con_DPrint("Nehahra not found.\n");
+ NehGameType = TYPE_GAME; // could just complain, but...
+ }
+ }
if (NehGameType == TYPE_DEMO)
MAIN_ITEMS = 4;
else if (NehGameType == TYPE_GAME)
}
-static void M_Main_Key (int key, char ascii)
+static void M_Main_Key (int key, int ascii)
{
switch (key)
{
}
-static void M_SinglePlayer_Key (int key, char ascii)
+static void M_SinglePlayer_Key (int key, int ascii)
{
if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
{
//=============================================================================
/* LOAD/SAVE MENU */
-static int load_cursor; // 0 < load_cursor < MAX_SAVEGAMES
+static int load_cursor; ///< 0 < load_cursor < MAX_SAVEGAMES
-#define MAX_SAVEGAMES 12
static char m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1];
static int loadable[MAX_SAVEGAMES];
static void M_ScanSaves (void)
{
- int i, j, len;
+ int i, j;
+ size_t len;
char name[MAX_OSPATH];
char buf[SAVEGAME_COMMENT_LENGTH + 256];
const char *t;
qfile_t *f;
- int version;
+// int version;
for (i=0 ; i<MAX_SAVEGAMES ; i++)
{
strlcpy (m_filenames[i], "--- UNUSED SLOT ---", sizeof(m_filenames[i]));
loadable[i] = false;
- sprintf (name, "s%i.sav", (int)i);
- f = FS_Open (name, "rb", false, false);
+ dpsnprintf (name, sizeof(name), "s%i.sav", (int)i);
+ f = FS_OpenRealFile (name, "rb", false);
if (!f)
continue;
// read enough to get the comment
len = FS_Read(f, buf, sizeof(buf) - 1);
- buf[sizeof(buf) - 1] = 0;
+ len = min(len, sizeof(buf)-1);
+ buf[len] = 0;
t = buf;
// version
COM_ParseToken_Simple(&t, false, false);
- version = atoi(com_token);
+ //version = atoi(com_token);
// description
COM_ParseToken_Simple(&t, false, false);
strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
{
if (!sv.active)
return;
+#if 1
+ // LordHavoc: allow saving multiplayer games
+ if (cl.islocalgame && cl.intermission)
+ return;
+#else
if (cl.intermission)
return;
if (!cl.islocalgame)
return;
+#endif
m_entersound = true;
m_state = m_save;
key_dest = key_menu;
}
-static void M_Load_Key (int k, char ascii)
+static void M_Load_Key (int k, int ascii)
{
switch (k)
{
}
-static void M_Save_Key (int k, char ascii)
+static void M_Save_Key (int k, int ascii)
{
switch (k)
{
M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/menu/episode%iselected", m_episode_cursor + 1));
}
-static void M_Transfusion_Episode_Key (int key, char ascii)
+static void M_Transfusion_Episode_Key (int key, int ascii)
{
switch (key)
{
M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va("gfx/menu/difficulty%iselected", m_skill_cursor + 1));
}
-static void M_Transfusion_Skill_Key (int key, char ascii)
+static void M_Transfusion_Skill_Key (int key, int ascii)
{
switch (key)
{
}
-static void M_MultiPlayer_Key (int key, char ascii)
+static void M_MultiPlayer_Key (int key, int ascii)
{
switch (key)
{
static int setup_cursor = 4;
static int setup_cursor_table[] = {40, 64, 88, 124, 140};
-static char setup_myname[32];
+static char setup_myname[MAX_SCOREBOARDNAME];
static int setup_oldtop;
static int setup_oldbottom;
static int setup_top;
typedef struct ratetable_s
{
int rate;
- char *name;
+ const char *name;
}
ratetable_t;
}
-static void M_Setup_Key (int k, char ascii)
+static void M_Setup_Key (int k, int ascii)
{
int l;
M_DrawCharacter (x+i*8, y, 130);
M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131);
if (fabs((int)num - num) < 0.01)
- sprintf(text, "%i", (int)num);
+ dpsnprintf(text, sizeof(text), "%i", (int)num);
else
- sprintf(text, "%.3f", num);
+ dpsnprintf(text, sizeof(text), "%.3f", num);
M_Print(x + (SLIDER_RANGE+2) * 8, y, text);
}
else if (options_cursor == optnum++) ;
else if (options_cursor == optnum++) ;
else if (options_cursor == optnum++) ;
- else if (options_cursor == optnum++) Cvar_SetValueQuick(&crosshair, bound(0, crosshair.integer + dir, 6));
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&crosshair, bound(0, crosshair.integer + dir, 7));
else if (options_cursor == optnum++) Cvar_SetValueQuick(&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
else if (options_cursor == optnum++) Cvar_SetValueQuick(&m_pitch, -m_pitch.value);
else if (options_cursor == optnum++) Cvar_SetValueQuick(&scr_fov, bound(1, scr_fov.integer + dir * 1, 170));
M_Options_PrintCommand( " Go to console", true);
M_Options_PrintCommand( " Reset to defaults", true);
M_Options_PrintCommand( " Change Video Mode", true);
- M_Options_PrintSlider( " Crosshair", true, crosshair.value, 0, 5);
+ M_Options_PrintSlider( " Crosshair", true, crosshair.value, 0, 7);
M_Options_PrintSlider( " Mouse Speed", true, sensitivity.value, 1, 50);
M_Options_PrintCheckbox(" Invert Mouse", true, m_pitch.value < 0);
M_Options_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170);
}
-static void M_Options_Key (int k, char ascii)
+static void M_Options_Key (int k, int ascii)
{
switch (k)
{
}
-static void M_Options_Effects_Key (int k, char ascii)
+static void M_Options_Effects_Key (int k, int ascii)
{
switch (k)
{
}
-static void M_Options_Graphics_Key (int k, char ascii)
+static void M_Options_Graphics_Key (int k, int ascii)
{
switch (k)
{
float x, c, s, t, u, v;
cachepic_t *p, *dither;
- dither = Draw_CachePic ("gfx/colorcontrol/ditherpattern");
+ dither = Draw_CachePic_Flags ("gfx/colorcontrol/ditherpattern", CACHEPICFLAG_NOCLAMP);
M_Background(320, 256);
}
-static void M_Options_ColorControl_Key (int k, char ascii)
+static void M_Options_ColorControl_Key (int k, int ascii)
{
switch (k)
{
//=============================================================================
/* KEYS MENU */
-static char *quakebindnames[][2] =
+static const char *quakebindnames[][2] =
{
{"+attack", "attack"},
{"impulse 10", "next weapon"},
{"+movedown", "swim down"}
};
-static char *transfusionbindnames[][2] =
+static const char *transfusionbindnames[][2] =
{
{"", "Movement"}, // Movement commands
{"+forward", "walk forward"},
{"impulse 79", "taunt 9"}
};
-static char *goodvsbad2bindnames[][2] =
+static const char *goodvsbad2bindnames[][2] =
{
{"impulse 69", "Power 1"},
{"impulse 70", "Power 2"},
};
static int numcommands;
-static char *(*bindnames)[2];
+static const char *(*bindnames)[2];
/*
typedef struct binditem_s
void M_Menu_Keys_f (void)
{
- key_dest = key_menu;
+ key_dest = key_menu_grabbed;
m_state = m_keys;
m_entersound = true;
-}
-
-#define NUMKEYS 5
-
-void M_FindKeysForCommand (const char *command, int *keys)
-{
- int count;
- int j;
- char *b;
-
- for (j = 0;j < NUMKEYS;j++)
- keys[j] = -1;
- count = 0;
+ if (gamemode == GAME_TRANSFUSION)
+ {
+ numcommands = sizeof(transfusionbindnames) / sizeof(transfusionbindnames[0]);
+ bindnames = transfusionbindnames;
+ }
+ else if (gamemode == GAME_GOODVSBAD2)
+ {
+ numcommands = sizeof(goodvsbad2bindnames) / sizeof(goodvsbad2bindnames[0]);
+ bindnames = goodvsbad2bindnames;
+ }
+ else
+ {
+ numcommands = sizeof(quakebindnames) / sizeof(quakebindnames[0]);
+ bindnames = quakebindnames;
+ }
- for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
+ // Make sure "keys_cursor" doesn't start on a section in the binding list
+ keys_cursor = 0;
+ while (bindnames[keys_cursor][0][0] == '\0')
{
- b = keybindings[0][j];
- if (!b)
- continue;
- if (!strcmp (b, command) )
- {
- keys[count++] = j;
- if (count == NUMKEYS)
- break;
- }
+ keys_cursor++;
+
+ // Only sections? There may be a problem somewhere...
+ if (keys_cursor >= numcommands)
+ Sys_Error ("M_Init: The key binding list only contains sections");
}
}
-static void M_UnbindCommand (char *command)
+#define NUMKEYS 5
+
+static void M_UnbindCommand (const char *command)
{
int j;
- char *b;
+ const char *b;
for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
{
else
M_Print(16, y, bindnames[i][1]);
- M_FindKeysForCommand (bindnames[i][0], keys);
+ Key_FindKeysForCommand (bindnames[i][0], keys, NUMKEYS, 0);
// LordHavoc: redesigned to print more than 2 keys, inspired by Tomaz's MiniRacer
if (keys[0] == -1)
}
-static void M_Keys_Key (int k, char ascii)
+static void M_Keys_Key (int k, int ascii)
{
char cmd[80];
int keys[NUMKEYS];
}
else //if (k != '`')
{
- sprintf (cmd, "bind \"%s\" \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor][0]);
+ dpsnprintf (cmd, sizeof(cmd), "bind \"%s\" \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor][0]);
Cbuf_InsertText (cmd);
}
break;
case K_ENTER: // go into bind mode
- M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
+ Key_FindKeysForCommand (bindnames[keys_cursor][0], keys, NUMKEYS, 0);
S_LocalSound ("sound/misc/menu2.wav");
if (keys[NUMKEYS - 1] != -1)
M_UnbindCommand (bindnames[keys_cursor][0]);
}
-static void M_Reset_Key (int key, char ascii)
+static void M_Reset_Key (int key, int ascii)
{
switch (key)
{
//=============================================================================
/* VIDEO MENU */
-// note: if modes are added to the beginning of this list, update VID_DEFAULT
-video_resolution_t video_resolutions[] =
+video_resolution_t video_resolutions_hardcoded[] =
{
{"Standard 4x3" , 320, 240, 320, 240, 1 },
{"Standard 4x3" , 400, 300, 400, 300, 1 },
{"WideScreen 16x9" , 683, 384, 683, 384, 1 },
{"WideScreen 16x9" , 960, 540, 640, 360, 1 },
{"WideScreen 16x9" , 1280, 720, 640, 360, 1 },
+{"WideScreen 16x9" , 1360, 768, 680, 384, 1 },
{"WideScreen 16x9" , 1366, 768, 683, 384, 1 },
{"WideScreen 16x9" , 1920,1080, 640, 360, 1 },
{"WideScreen 16x9" , 2560,1440, 640, 360, 1 },
{NULL, 0, 0, 0, 0, 0}
};
// this is the number of the default mode (640x480) in the list above
-#define VID_DEFAULT 3
-#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
+int video_resolutions_hardcoded_count = sizeof(video_resolutions_hardcoded) / sizeof(*video_resolutions_hardcoded) - 1;
#define VIDEO_ITEMS 11
static int video_cursor = 0;
static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152, 168};
-static int video_resolution;
+static int menu_video_resolution;
-void M_Menu_Video_f (void)
+video_resolution_t *video_resolutions;
+int video_resolutions_count;
+
+static video_resolution_t *menu_video_resolutions;
+static int menu_video_resolutions_count;
+static qboolean menu_video_resolutions_forfullscreen;
+
+static void M_Menu_Video_FindResolution(int w, int h, float a)
{
int i;
- key_dest = key_menu;
- m_state = m_video;
- m_entersound = true;
+ if(menu_video_resolutions_forfullscreen)
+ {
+ menu_video_resolutions = video_resolutions;
+ menu_video_resolutions_count = video_resolutions_count;
+ }
+ else
+ {
+ menu_video_resolutions = video_resolutions_hardcoded;
+ menu_video_resolutions_count = video_resolutions_hardcoded_count;
+ }
// Look for the closest match to the current resolution
- video_resolution = 0;
- for (i = 1;i < VID_RES_COUNT;i++)
+ menu_video_resolution = 0;
+ for (i = 1;i < menu_video_resolutions_count;i++)
{
// if the new mode would be a worse match in width, skip it
- if (fabs(video_resolutions[i].width - vid.width) > fabs(video_resolutions[video_resolution].width - vid.width))
+ if (abs(menu_video_resolutions[i].width - w) > abs(menu_video_resolutions[menu_video_resolution].width - w))
continue;
// if it is equal in width, check height
- if (video_resolutions[i].width == vid.width && video_resolutions[video_resolution].width == vid.width)
+ if (menu_video_resolutions[i].width == w && menu_video_resolutions[menu_video_resolution].width == w)
{
// if the new mode would be a worse match in height, skip it
- if (fabs(video_resolutions[i].height - vid.height) > fabs(video_resolutions[video_resolution].height - vid.height))
+ if (abs(menu_video_resolutions[i].height - h) > abs(menu_video_resolutions[menu_video_resolution].height - h))
continue;
// if it is equal in width and height, check pixel aspect
- if (video_resolutions[i].height == vid.height && video_resolutions[video_resolution].height == vid.height)
+ if (menu_video_resolutions[i].height == h && menu_video_resolutions[menu_video_resolution].height == h)
{
// if the new mode would be a worse match in pixel aspect, skip it
- if (fabs(video_resolutions[i].pixelheight - vid_pixelheight.value) > fabs(video_resolutions[video_resolution].pixelheight - vid_pixelheight.value))
+ if (abs(menu_video_resolutions[i].pixelheight - a) > abs(menu_video_resolutions[menu_video_resolution].pixelheight - a))
continue;
// if it is equal in everything, skip it (prefer earlier modes)
- if (video_resolutions[i].pixelheight == vid_pixelheight.value && video_resolutions[video_resolution].pixelheight == vid_pixelheight.value)
+ if (menu_video_resolutions[i].pixelheight == a && menu_video_resolutions[menu_video_resolution].pixelheight == a)
continue;
// better match for width, height, and pixel aspect
- video_resolution = i;
+ menu_video_resolution = i;
}
else // better match for width and height
- video_resolution = i;
+ menu_video_resolution = i;
}
else // better match for width
- video_resolution = i;
+ menu_video_resolution = i;
}
}
+void M_Menu_Video_f (void)
+{
+ key_dest = key_menu;
+ m_state = m_video;
+ m_entersound = true;
+
+ M_Menu_Video_FindResolution(vid.width, vid.height, vid_pixelheight.value);
+}
+
static void M_Video_Draw (void)
{
int t;
cachepic_t *p;
+ if(!!vid_fullscreen.integer != menu_video_resolutions_forfullscreen)
+ {
+ video_resolution_t *res = &menu_video_resolutions[menu_video_resolution];
+ menu_video_resolutions_forfullscreen = !!vid_fullscreen.integer;
+ M_Menu_Video_FindResolution(res->width, res->height, res->pixelheight);
+ }
+
M_Background(320, 200);
M_DrawPic(16, 4, "gfx/qplaque");
// Current and Proposed Resolution
M_Print(16, video_cursor_table[t] - 12, " Current Resolution");
if (vid_supportrefreshrate && vid.userefreshrate && vid.fullscreen)
- M_Print(220, video_cursor_table[t] - 12, va("%dx%d %dhz", vid.width, vid.height, vid.refreshrate));
+ M_Print(220, video_cursor_table[t] - 12, va("%dx%d %.2fhz", vid.width, vid.height, vid.refreshrate));
else
M_Print(220, video_cursor_table[t] - 12, va("%dx%d", vid.width, vid.height));
M_Print(16, video_cursor_table[t], " New Resolution");
- M_Print(220, video_cursor_table[t], va("%dx%d", video_resolutions[video_resolution].width, video_resolutions[video_resolution].height));
- M_Print(96, video_cursor_table[t] + 8, va("Type: %s", video_resolutions[video_resolution].type));
+ M_Print(220, video_cursor_table[t], va("%dx%d", menu_video_resolutions[menu_video_resolution].width, menu_video_resolutions[menu_video_resolution].height));
+ M_Print(96, video_cursor_table[t] + 8, va("Type: %s", menu_video_resolutions[menu_video_resolution].type));
t++;
// Bits per pixel
// Refresh Rate
M_ItemPrint(16, video_cursor_table[t], " Refresh Rate", vid_supportrefreshrate && vid_userefreshrate.integer);
- M_DrawSlider(220, video_cursor_table[t], vid_refreshrate.integer, 60, 150);
+ M_DrawSlider(220, video_cursor_table[t], vid_refreshrate.value, 50, 150);
t++;
// Fullscreen
t++;
// Vertical Sync
- M_ItemPrint(16, video_cursor_table[t], " Vertical Sync", gl_videosyncavailable);
+ M_ItemPrint(16, video_cursor_table[t], " Vertical Sync", true);
M_DrawCheckbox(220, video_cursor_table[t], vid_vsync.integer);
t++;
- M_ItemPrint(16, video_cursor_table[t], " Anisotropic Filter", gl_support_anisotropy);
- M_DrawSlider(220, video_cursor_table[t], gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
+ M_ItemPrint(16, video_cursor_table[t], " Anisotropic Filter", vid.support.ext_texture_filter_anisotropic);
+ M_DrawSlider(220, video_cursor_table[t], gl_texture_anisotropy.integer, 1, vid.max_anisotropy);
t++;
M_ItemPrint(16, video_cursor_table[t], " Texture Quality", true);
M_DrawSlider(220, video_cursor_table[t], gl_picmip.value, 3, 0);
t++;
- M_ItemPrint(16, video_cursor_table[t], " Texture Compression", gl_support_texture_compression);
+ M_ItemPrint(16, video_cursor_table[t], " Texture Compression", vid.support.arb_texture_compression);
M_DrawCheckbox(220, video_cursor_table[t], gl_texturecompression.integer);
t++;
{
// Resolution
int r;
- for(r = 0;r < VID_RES_COUNT;r++)
+ for(r = 0;r < menu_video_resolutions_count;r++)
{
- video_resolution += dir;
- if (video_resolution >= VID_RES_COUNT)
- video_resolution = 0;
- if (video_resolution < 0)
- video_resolution = VID_RES_COUNT - 1;
- if (video_resolutions[video_resolution].width >= vid_minwidth.integer && video_resolutions[video_resolution].height >= vid_minheight.integer)
+ menu_video_resolution += dir;
+ if (menu_video_resolution >= menu_video_resolutions_count)
+ menu_video_resolution = 0;
+ if (menu_video_resolution < 0)
+ menu_video_resolution = menu_video_resolutions_count - 1;
+ if (menu_video_resolutions[menu_video_resolution].width >= vid_minwidth.integer && menu_video_resolutions[menu_video_resolution].height >= vid_minheight.integer)
break;
}
}
else if (video_cursor == t++)
Cvar_SetValueQuick (&vid_userefreshrate, !vid_userefreshrate.integer);
else if (video_cursor == t++)
- Cvar_SetValueQuick (&vid_refreshrate, bound(60, vid_refreshrate.integer + dir, 150));
+ Cvar_SetValueQuick (&vid_refreshrate, bound(50, vid_refreshrate.value + dir, 150));
else if (video_cursor == t++)
Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
else if (video_cursor == t++)
Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
else if (video_cursor == t++)
- Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value * (dir < 0 ? 0.5 : 2.0), gl_max_anisotropy));
+ Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value * (dir < 0 ? 0.5 : 2.0), vid.max_anisotropy));
else if (video_cursor == t++)
Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
else if (video_cursor == t++)
}
-static void M_Video_Key (int key, char ascii)
+static void M_Video_Key (int key, int ascii)
{
switch (key)
{
switch (video_cursor)
{
case (VIDEO_ITEMS - 1):
- Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution].width);
- Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution].height);
- Cvar_SetValueQuick (&vid_conwidth, video_resolutions[video_resolution].conwidth);
- Cvar_SetValueQuick (&vid_conheight, video_resolutions[video_resolution].conheight);
- Cvar_SetValueQuick (&vid_pixelheight, video_resolutions[video_resolution].pixelheight);
+ Cvar_SetValueQuick (&vid_width, menu_video_resolutions[menu_video_resolution].width);
+ Cvar_SetValueQuick (&vid_height, menu_video_resolutions[menu_video_resolution].height);
+ Cvar_SetValueQuick (&vid_conwidth, menu_video_resolutions[menu_video_resolution].conwidth);
+ Cvar_SetValueQuick (&vid_conheight, menu_video_resolutions[menu_video_resolution].conheight);
+ Cvar_SetValueQuick (&vid_pixelheight, menu_video_resolutions[menu_video_resolution].pixelheight);
Cbuf_AddText ("vid_restart\n");
M_Menu_Options_f ();
break;
}
-static void M_Help_Key (int key, char ascii)
+static void M_Help_Key (int key, int ascii)
{
switch (key)
{
}
-static void M_Credits_Key (int key, char ascii)
+static void M_Credits_Key (int key, int ascii)
{
M_Menu_Main_f ();
}
//=============================================================================
/* QUIT MENU */
-static char *m_quit_message[9];
+static const char *m_quit_message[9];
static int m_quit_prevstate;
static qboolean wasInMenus;
-static int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8)
+static int M_QuitMessage(const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, const char *line6, const char *line7, const char *line8)
{
m_quit_message[0] = line1;
m_quit_message[1] = line2;
break;
}
return 0;
-};
+}
void M_Menu_Quit_f (void)
{
}
-static void M_Quit_Key (int key, char ascii)
+static void M_Quit_Key (int key, int ascii)
{
switch (key)
{
static int lanConfig_port;
static char lanConfig_portname[6];
-static char lanConfig_joinname[22];
+static char lanConfig_joinname[40];
void M_Menu_LanConfig_f (void)
{
if (StartingGame)
lanConfig_cursor = 1;
lanConfig_port = 26000;
- sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port);
+ dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port);
M_Update_Return_Reason("");
}
{
cachepic_t *p;
int basex;
- char *startJoin;
- char *protocol;
+ const char *startJoin;
+ const char *protocol;
M_Background(320, 200);
basex += 8;
M_Print(basex, lanConfig_cursor_table[0], "Port");
- M_DrawTextBox (basex+8*8, lanConfig_cursor_table[0]-8, 6, 1);
+ M_DrawTextBox (basex+8*8, lanConfig_cursor_table[0]-8, sizeof(lanConfig_portname), 1);
M_Print(basex+9*8, lanConfig_cursor_table[0], lanConfig_portname);
if (JoiningGame)
M_Print(basex, lanConfig_cursor_table[1], "Search for DarkPlaces games...");
M_Print(basex, lanConfig_cursor_table[2], "Search for QuakeWorld games...");
M_Print(basex, lanConfig_cursor_table[3]-16, "Join game at:");
- M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, 22, 1);
+ M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, sizeof(lanConfig_joinname), 1);
M_Print(basex+16, lanConfig_cursor_table[3], lanConfig_joinname);
}
else
}
-static void M_LanConfig_Key (int key, char ascii)
+static void M_LanConfig_Key (int key, int ascii)
{
int l;
if (lanConfig_cursor == 3)
{
l = (int)strlen(lanConfig_joinname);
- if (l < 21)
+ if (l < (int)sizeof(lanConfig_joinname) - 1)
{
lanConfig_joinname[l+1] = 0;
lanConfig_joinname[l] = ascii;
if (lanConfig_cursor == 0)
{
l = (int)strlen(lanConfig_portname);
- if (l < 5)
+ if (l < (int)sizeof(lanConfig_portname) - 1)
{
lanConfig_portname[l+1] = 0;
lanConfig_portname[l] = ascii;
l = atoi(lanConfig_portname);
if (l <= 65535)
lanConfig_port = l;
- sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port);
+ dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port);
}
//=============================================================================
typedef struct level_s
{
- char *name;
- char *description;
+ const char *name;
+ const char *description;
} level_t;
typedef struct episode_s
{
- char *description;
+ const char *description;
int firstLevel;
int levels;
} episode_t;
typedef struct gamelevels_s
{
- char *gamename;
+ const char *gamename;
level_t *levels;
episode_t *episodes;
int numepisodes;
{GAME_OPENQUARTZ, &openquartzgame, &openquartzgame},
{GAME_DEFEATINDETAIL2, &defeatindetail2game, &defeatindetail2game},
{GAME_PRYDON, &prydongame, &prydongame},
- {GAME_NORMAL, NULL, NULL} // terminator
};
-static gamelevels_t *lookupgameinfo(void)
-{
- int i = 0;
- while (gamelist[i].gameid != gamemode)
- {
- if (gamelist[i].notregistered == NULL)
- {
- i = 0;
- break;
- }
- i++;
- }
- if (registered.integer)
- return gamelist[i].registered;
- else
- return gamelist[i].notregistered;
-}
+static gamelevels_t *gameoptions_levels = NULL;
static int startepisode;
static int startlevel;
void M_Menu_GameOptions_f (void)
{
+ int i;
key_dest = key_menu;
m_state = m_gameoptions;
m_entersound = true;
maxplayers = svs.maxclients;
if (maxplayers < 2)
maxplayers = min(8, MAX_SCOREBOARD);
+ // pick game level list based on gamemode (use GAME_NORMAL if no matches)
+ gameoptions_levels = registered.integer ? gamelist[0].registered : gamelist[0].notregistered;
+ for (i = 0;i < (int)(sizeof(gamelist)/sizeof(gamelist[0]));i++)
+ if (gamelist[i].gameid == gamemode)
+ gameoptions_levels = registered.integer ? gamelist[i].registered : gamelist[i].notregistered;
}
{
cachepic_t *p;
int x;
- gamelevels_t *g;
M_Background(320, 200);
M_Print(0, 72, " Teamplay");
if (gamemode == GAME_ROGUE)
{
- char *msg;
+ const char *msg;
switch((int)teamplay.integer)
{
}
else
{
- char *msg;
+ const char *msg;
switch (teamplay.integer)
{
M_DrawTextBox (0, 132, 38, 1);
M_Print(8, 140, hostname.string);
- g = lookupgameinfo();
-
if (gamemode != GAME_GOODVSBAD2)
{
M_Print(0, 160, " Episode");
- M_Print(160, 160, g->episodes[startepisode].description);
+ M_Print(160, 160, gameoptions_levels->episodes[startepisode].description);
}
M_Print(0, 168, " Level");
- M_Print(160, 168, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
- M_Print(160, 176, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
+ M_Print(160, 168, gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].description);
+ M_Print(160, 176, gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].name);
// line cursor
if (gameoptions_cursor == 9)
static void M_NetStart_Change (int dir)
{
- gamelevels_t *g;
int count;
switch (gameoptions_cursor)
if (gamemode == GAME_GOODVSBAD2)
break;
startepisode += dir;
- g = lookupgameinfo();
if (startepisode < 0)
- startepisode = g->numepisodes - 1;
+ startepisode = gameoptions_levels->numepisodes - 1;
- if (startepisode >= g->numepisodes)
+ if (startepisode >= gameoptions_levels->numepisodes)
startepisode = 0;
startlevel = 0;
case 11:
startlevel += dir;
- g = lookupgameinfo();
if (startlevel < 0)
- startlevel = g->episodes[startepisode].levels - 1;
+ startlevel = gameoptions_levels->episodes[startepisode].levels - 1;
- if (startlevel >= g->episodes[startepisode].levels)
+ if (startlevel >= gameoptions_levels->episodes[startepisode].levels)
startlevel = 0;
break;
}
}
-static void M_GameOptions_Key (int key, char ascii)
+static void M_GameOptions_Key (int key, int ascii)
{
- gamelevels_t *g;
int l;
char hostnamebuf[128];
Cbuf_AddText ("disconnect\n");
Cbuf_AddText ( va ("maxplayers %u\n", maxplayers) );
- g = lookupgameinfo();
- Cbuf_AddText ( va ("map %s\n", g->levels[g->episodes[startepisode].firstLevel + startlevel].name) );
+ Cbuf_AddText ( va ("map %s\n", gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].name) );
return;
}
{
for (n = start;n < end;n++)
{
+ serverlist_entry_t *entry = ServerList_GetViewEntry(n);
DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
- M_PrintColored(0, y, serverlist_viewlist[n]->line1);y += 8;
- M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8;
+ M_PrintColored(0, y, entry->line1);y += 8;
+ M_PrintColored(0, y, entry->line2);y += 8;
}
}
else if (realtime - masterquerytime > 10)
}
-static void M_ServerList_Key(int k, char ascii)
+static void M_ServerList_Key(int k, int ascii)
{
switch (k)
{
case K_ENTER:
S_LocalSound ("sound/misc/menu2.wav");
if (serverlist_viewcount)
- Cbuf_AddText(va("connect \"%s\"\n", serverlist_viewlist[slist_cursor]->info.cname));
+ Cbuf_AddText(va("connect \"%s\"\n", ServerList_GetViewEntry(slist_cursor)->info.cname));
break;
default:
static int modlist_cursor;
//static int modlist_viewcount;
-#define MODLIST_TOTALSIZE 256
static int modlist_count = 0;
static modlist_entry_t modlist[MODLIST_TOTALSIZE];
{
int i,j;
stringlist_t list;
- int basedirlength;
stringlistinit(&list);
- if (fs_basedir[0])
- {
- listdirectory(&list, fs_basedir);
- basedirlength = strlen( fs_basedir );
- }
- else
- {
- listdirectory(&list, "./");
- basedirlength = 2;
- }
+ listdirectory(&list, fs_basedir, "");
stringlistsort(&list);
modlist_count = 0;
modlist_numenabled = fs_numgamedirs;
if (modlist_count >= MODLIST_TOTALSIZE) break;
// check all dirs to see if they "appear" to be mods
// reject any dirs that are part of the base game
- // (such as "id1" and "hipnotic" when in GAME_HIPNOTIC mode)
if (gamedirname1 && !strcasecmp(gamedirname1, list.strings[i])) continue;
- if (gamedirname2 && !strcasecmp(gamedirname2, list.strings[i])) continue;
+ //if (gamedirname2 && !strcasecmp(gamedirname2, list.strings[i])) continue;
if (FS_CheckNastyPath (list.strings[i], true)) continue;
if (!FS_CheckGameDir(list.strings[i])) continue;
- strlcpy (modlist[modlist_count].dir, list.strings[i] + basedirlength, sizeof(modlist[modlist_count].dir));
+ strlcpy (modlist[modlist_count].dir, list.strings[i], sizeof(modlist[modlist_count].dir));
//check currently loaded mods
modlist[modlist_count].loaded = false;
if (fs_numgamedirs)
}
}
-static void M_ModList_Key(int k, char ascii)
+static void M_ModList_Key(int k, int ascii)
{
switch (k)
{
//=============================================================================
/* Menu Subsystem */
-static void M_KeyEvent(int key, char ascii, qboolean downevent);
+static void M_KeyEvent(int key, int ascii, qboolean downevent);
static void M_Draw(void);
-void M_ToggleMenu_f(void);
+void M_ToggleMenu(int mode);
static void M_Shutdown(void);
void M_Init (void)
Cmd_AddCommand ("menu_transfusion_episode", M_Menu_Transfusion_Episode_f, "open the transfusion episode select menu");
Cmd_AddCommand ("menu_transfusion_skill", M_Menu_Transfusion_Skill_f, "open the transfusion skill select menu");
Cmd_AddCommand ("menu_credits", M_Menu_Credits_f, "open the credits menu");
-
- if (gamemode == GAME_TRANSFUSION)
- {
- numcommands = sizeof(transfusionbindnames) / sizeof(transfusionbindnames[0]);
- bindnames = transfusionbindnames;
- }
- else if (gamemode == GAME_GOODVSBAD2)
- {
- numcommands = sizeof(goodvsbad2bindnames) / sizeof(goodvsbad2bindnames[0]);
- bindnames = goodvsbad2bindnames;
- }
- else
- {
- numcommands = sizeof(quakebindnames) / sizeof(quakebindnames[0]);
- bindnames = quakebindnames;
- }
-
- // Make sure "keys_cursor" doesn't start on a section in the binding list
- keys_cursor = 0;
- while (bindnames[keys_cursor][0][0] == '\0')
- {
- keys_cursor++;
-
- // Only sections? There may be a problem somewhere...
- if (keys_cursor >= numcommands)
- Sys_Error ("M_Init: The key binding list only contains sections");
- }
-
-
- if (gamemode == GAME_NEHAHRA)
- {
- if (FS_FileExists("maps/neh1m4.bsp"))
- {
- if (FS_FileExists("hearing.dem"))
- {
- Con_Print("Nehahra movie and game detected.\n");
- NehGameType = TYPE_BOTH;
- }
- else
- {
- Con_Print("Nehahra game detected.\n");
- NehGameType = TYPE_GAME;
- }
- }
- else
- {
- if (FS_FileExists("hearing.dem"))
- {
- Con_Print("Nehahra movie detected.\n");
- NehGameType = TYPE_DEMO;
- }
- else
- {
- Con_Print("Nehahra not found.\n");
- NehGameType = TYPE_GAME; // could just complain, but...
- }
- }
- }
}
void M_Draw (void)
}
-void M_KeyEvent (int key, char ascii, qboolean downevent)
+void M_KeyEvent (int key, int ascii, qboolean downevent)
{
if (!downevent)
return;
}
-void M_Shutdown(void)
+void M_NewMap(void)
{
- // reset key_dest
- key_dest = key_game;
}
-void M_Restart(void)
+void M_Shutdown(void)
{
+ // reset key_dest
+ key_dest = key_game;
}
//============================================================================
// Menu prog handling
-static char *m_required_func[] = {
+static const char *m_required_func[] = {
"m_init",
"m_keydown",
"m_draw",
Host_AbortCurrentFrame();
}
-void MP_KeyEvent (int key, char ascii, qboolean downevent)
+void MP_KeyEvent (int key, int ascii, qboolean downevent)
{
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
R_SelectScene( RST_CLIENT );
}
-void MP_ToggleMenu_f (void)
+void MP_ToggleMenu(int mode)
{
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
+ prog->globals.generic[OFS_PARM0] = (float) mode;
PRVM_ExecuteProgram(prog->funcoffsets.m_toggle,"m_toggle() required");
PRVM_End;
}
+void MP_NewMap(void)
+{
+ PRVM_Begin;
+ PRVM_SetProg(PRVM_MENUPROG);
+ if (prog->funcoffsets.m_newmap)
+ PRVM_ExecuteProgram(prog->funcoffsets.m_newmap,"m_newmap() required");
+ PRVM_End;
+}
+
void MP_Shutdown (void)
{
PRVM_Begin;
prog->init_cmd = VM_M_Cmd_Init;
prog->reset_cmd = VM_M_Cmd_Reset;
prog->error_cmd = MP_Error;
+ prog->ExecuteProgram = MVM_ExecuteProgram;
// allocate the mempools
prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL);
// note: OP_STATE is not supported by menu qc, we don't even try to detect
// it here
+ in_client_mouse = true;
+
// call the prog init
PRVM_ExecuteProgram(prog->funcoffsets.m_init,"m_init() required");
PRVM_End;
}
-void MP_Restart(void)
-{
- MP_Init();
-}
-
//============================================================================
// Menu router
-void (*MR_KeyEvent) (int key, char ascii, qboolean downevent);
+void (*MR_KeyEvent) (int key, int ascii, qboolean downevent);
void (*MR_Draw) (void);
-void (*MR_ToggleMenu_f) (void);
+void (*MR_ToggleMenu) (int mode);
void (*MR_Shutdown) (void);
+void (*MR_NewMap) (void);
void MR_SetRouting(qboolean forceold)
{
- static qboolean m_init = FALSE, mp_init = FALSE;
-
// if the menu prog isnt available or forceqmenu ist set, use the old menu
if(!FS_FileExists(M_PROG_FILENAME) || forceqmenu.integer || forceold)
{
// set menu router function pointers
MR_KeyEvent = M_KeyEvent;
MR_Draw = M_Draw;
- MR_ToggleMenu_f = M_ToggleMenu_f;
+ MR_ToggleMenu = M_ToggleMenu;
MR_Shutdown = M_Shutdown;
-
- // init
- if(!m_init)
- {
- M_Init();
- m_init = TRUE;
- }
- else
- M_Restart();
+ MR_NewMap = M_NewMap;
+ M_Init();
}
else
{
// set menu router function pointers
MR_KeyEvent = MP_KeyEvent;
MR_Draw = MP_Draw;
- MR_ToggleMenu_f = MP_ToggleMenu_f;
+ MR_ToggleMenu = MP_ToggleMenu;
MR_Shutdown = MP_Shutdown;
-
- if(!mp_init)
- {
- MP_Init();
- mp_init = TRUE;
- }
- else
- MP_Restart();
+ MR_NewMap = MP_NewMap;
+ MP_Init();
}
}
void Call_MR_ToggleMenu_f(void)
{
+ int m;
+ m = ((Cmd_Argc() < 2) ? -1 : atoi(Cmd_Argv(1)));
Host_StartVideo();
- if(MR_ToggleMenu_f)
- MR_ToggleMenu_f();
+ if(MR_ToggleMenu)
+ MR_ToggleMenu(m);
}
void MR_Init_Commands(void)
// set router console commands
Cvar_RegisterVariable (&forceqmenu);
Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
- Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat");
+ Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat)");
Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu");
}
void MR_Init(void)
{
+ vid_mode_t res[1024];
+ size_t res_count, i;
+
+ res_count = VID_ListModes(res, sizeof(res) / sizeof(*res));
+ res_count = VID_SortModes(res, res_count, false, false, true);
+ if(res_count)
+ {
+ video_resolutions_count = res_count;
+ video_resolutions = (video_resolution_t *) Mem_Alloc(cls.permanentmempool, sizeof(*video_resolutions) * (video_resolutions_count + 1));
+ memset(&video_resolutions[video_resolutions_count], 0, sizeof(video_resolutions[video_resolutions_count]));
+ for(i = 0; i < res_count; ++i)
+ {
+ int n, d, t;
+ video_resolutions[i].type = "Detected mode"; // FIXME make this more dynamic
+ video_resolutions[i].width = res[i].width;
+ video_resolutions[i].height = res[i].height;
+ video_resolutions[i].pixelheight = res[i].pixelheight_num / (double) res[i].pixelheight_denom;
+ n = res[i].pixelheight_denom * video_resolutions[i].width;
+ d = res[i].pixelheight_num * video_resolutions[i].height;
+ while(d)
+ {
+ t = n;
+ n = d;
+ d = t % d;
+ }
+ d = (res[i].pixelheight_num * video_resolutions[i].height) / n;
+ n = (res[i].pixelheight_denom * video_resolutions[i].width) / n;
+ switch(n * 0x10000 | d)
+ {
+ case 0x00040003:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 480;
+ video_resolutions[i].type = "Standard 4x3";
+ break;
+ case 0x00050004:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 512;
+ if(res[i].pixelheight_denom == res[i].pixelheight_num)
+ video_resolutions[i].type = "Square Pixel (LCD) 5x4";
+ else
+ video_resolutions[i].type = "Short Pixel (CRT) 5x4";
+ break;
+ case 0x00080005:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 400;
+ if(res[i].pixelheight_denom == res[i].pixelheight_num)
+ video_resolutions[i].type = "Widescreen 8x5";
+ else
+ video_resolutions[i].type = "Tall Pixel (CRT) 8x5";
+
+ break;
+ case 0x00050003:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 384;
+ video_resolutions[i].type = "Widescreen 5x3";
+ break;
+ case 0x000D0009:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 400;
+ video_resolutions[i].type = "Widescreen 14x9";
+ break;
+ case 0x00100009:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 480;
+ video_resolutions[i].type = "Widescreen 16x9";
+ break;
+ case 0x00030002:
+ video_resolutions[i].conwidth = 720;
+ video_resolutions[i].conheight = 480;
+ video_resolutions[i].type = "NTSC 3x2";
+ break;
+ case 0x000D000B:
+ video_resolutions[i].conwidth = 720;
+ video_resolutions[i].conheight = 566;
+ video_resolutions[i].type = "PAL 14x11";
+ break;
+ case 0x00080007:
+ if(video_resolutions[i].width >= 512)
+ {
+ video_resolutions[i].conwidth = 512;
+ video_resolutions[i].conheight = 448;
+ video_resolutions[i].type = "SNES 8x7";
+ }
+ else
+ {
+ video_resolutions[i].conwidth = 256;
+ video_resolutions[i].conheight = 224;
+ video_resolutions[i].type = "NES 8x7";
+ }
+ break;
+ default:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 640 * d / n;
+ video_resolutions[i].type = "Detected mode";
+ break;
+ }
+ if(video_resolutions[i].conwidth > video_resolutions[i].width || video_resolutions[i].conheight > video_resolutions[i].height)
+ {
+ int f1, f2;
+ f1 = video_resolutions[i].conwidth > video_resolutions[i].width;
+ f2 = video_resolutions[i].conheight > video_resolutions[i].height;
+ if(f1 > f2)
+ {
+ video_resolutions[i].conwidth = video_resolutions[i].width;
+ video_resolutions[i].conheight = video_resolutions[i].conheight / f1;
+ }
+ else
+ {
+ video_resolutions[i].conwidth = video_resolutions[i].conwidth / f2;
+ video_resolutions[i].conheight = video_resolutions[i].height;
+ }
+ }
+ }
+ }
+ else
+ {
+ video_resolutions = video_resolutions_hardcoded;
+ video_resolutions_count = sizeof(video_resolutions_hardcoded) / sizeof(*video_resolutions_hardcoded) - 1;
+ }
+
+ menu_video_resolutions_forfullscreen = !!vid_fullscreen.integer;
+ M_Menu_Video_FindResolution(vid.width, vid.height, vid_pixelheight.value);
+
// use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1)
// COMMANDLINEOPTION: Client: -forceqmenu disables menu.dat (same as +forceqmenu 1)
if(COM_CheckParm("-forceqmenu"))