#define TYPE_GAME 2
#define TYPE_BOTH 3
+static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)" };
+
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);
void M_Menu_LanConfig_f (void);
void M_Menu_GameOptions_f (void);
void M_Menu_ServerList_f (void);
+void M_Menu_ModList_f (void);
static void M_Main_Draw (void);
static void M_SinglePlayer_Draw (void);
static void M_LanConfig_Draw (void);
static void M_GameOptions_Draw (void);
static void M_ServerList_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 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_ModList_Draw (void);
+
+
+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_Pic(menu_x, menu_y, NULL, menu_width, menu_height, 0, 0, 0, 0.5, 0);
- DrawQ_Pic(0, 0, NULL, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0);
+ //DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
+ DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0);
}
/*
char temp[2];
temp[0] = num;
temp[1] = 0;
- DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
+ 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_ColoredString(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL);
+ 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(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
+ 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(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0);
+ 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(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
else
- DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0);
+ 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)
{
- DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic(picname, true), 0, 0, 1, 1, 1, 1, 0);
-}
-
-static unsigned char identityTable[256];
-static unsigned char translationTable[256];
-
-static void M_BuildTranslationTable(int top, int bottom)
-{
- int j;
- unsigned char *dest, *source;
-
- for (j = 0; j < 256; j++)
- identityTable[j] = j;
- dest = translationTable;
- source = identityTable;
- memcpy (dest, source, 256);
-
- // LordHavoc: corrected skin color ranges
- if (top < 128 || (top >= 224 && top < 240)) // the artists made some backwards ranges. sigh.
- memcpy (dest + TOP_RANGE, source + top, 16);
- else
- for (j=0 ; j<16 ; j++)
- dest[TOP_RANGE+j] = source[top+15-j];
-
- // LordHavoc: corrected skin color ranges
- if (bottom < 128 || (bottom >= 224 && bottom < 240))
- memcpy (dest + BOTTOM_RANGE, source + bottom, 16);
- else
- for (j=0 ; j<16 ; j++)
- dest[BOTTOM_RANGE+j] = source[bottom+15-j];
+ DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic (picname), 0, 0, 1, 1, 1, 1, 0);
}
static void M_DrawTextBox(float x, float y, float width, float height)
/*
================
-M_ToggleMenu_f
+M_ToggleMenu
================
*/
-void M_ToggleMenu_f (void)
+void M_ToggleMenu(int mode)
{
m_entersound = true;
- if (key_dest != key_menu || m_state != m_main)
+ 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)
else
MAIN_ITEMS = 6;
}
- else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
- MAIN_ITEMS = 6;
else if (gamemode == GAME_TRANSFUSION)
{
s = "gfx/menu/mainmenu1";
MAIN_ITEMS = 5;
// check if the game data is missing and use a different main menu if so
- m_missingdata = Draw_CachePic (s, true)->tex == r_texture_notexture;
+ m_missingdata = !forceqmenu.integer && Draw_CachePic (s)->tex == r_texture_notexture;
if (m_missingdata)
MAIN_ITEMS = 2;
if (gamemode == GAME_TRANSFUSION) {
int y1, y2, y3;
M_Background(640, 480);
- p = Draw_CachePic ("gfx/menu/tb-transfusion", true);
+ p = Draw_CachePic ("gfx/menu/tb-transfusion");
M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-transfusion");
y2 = 120;
// 8 rather than MAIN_ITEMS to skip a number and not miss the last option
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/ttl_main", true);
+ p = Draw_CachePic ("gfx/ttl_main");
M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main");
// Nehahra
if (gamemode == GAME_NEHAHRA)
}
-static void M_Main_Key (int key, char ascii)
+static void M_Main_Key (int key, int ascii)
{
switch (key)
{
break;
}
}
- else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
- {
- switch (m_main_cursor)
- {
- case 0:
- M_Menu_SinglePlayer_f ();
- break;
-
- case 1:
- M_Menu_MultiPlayer_f ();
- break;
-
- case 2:
- M_Menu_Options_f ();
- break;
-
- case 3:
- M_Menu_Help_f ();
- break;
-
- case 4:
- M_Menu_Quit_f ();
- break;
- case 5:
- MR_Restart();
- break;
- }
- }
else if (gamemode == GAME_TRANSFUSION) {
if (MAIN_ITEMS == 7)
{
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/ttl_sgl", true);
+ p = Draw_CachePic ("gfx/ttl_sgl");
// Some mods don't have a single player mode
if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
}
-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_ParseTokenConsole(&t);
- version = atoi(com_token);
+ COM_ParseToken_Simple(&t, false, false);
+ //version = atoi(com_token);
// description
- COM_ParseTokenConsole(&t);
+ COM_ParseToken_Simple(&t, false, false);
strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
// change _ back to space
{
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;
M_Background(320, 200);
- p = Draw_CachePic ("gfx/p_load", true);
+ p = Draw_CachePic ("gfx/p_load");
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load" );
for (i=0 ; i< MAX_SAVEGAMES; i++)
M_Background(320, 200);
- p = Draw_CachePic ("gfx/p_save", true);
+ p = Draw_CachePic ("gfx/p_save");
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save");
for (i=0 ; i<MAX_SAVEGAMES ; i++)
}
-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)
{
cachepic_t *p;
M_Background(640, 480);
- p = Draw_CachePic ("gfx/menu/tb-episodes", true);
+ p = Draw_CachePic ("gfx/menu/tb-episodes");
M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-episodes");
for (y = 0; y < EPISODE_ITEMS; y++){
M_DrawPic (0, 160 + y * 40, va("gfx/menu/episode%i", y+1));
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)
{
cachepic_t *p;
M_Background(640, 480);
- p = Draw_CachePic ("gfx/menu/tb-difficulty", true);
+ p = Draw_CachePic ("gfx/menu/tb-difficulty");
M_DrawPic(640/2 - p->width/2, 40, "gfx/menu/tb-difficulty");
for (y = 0; y < SKILL_ITEMS; y++)
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)
{
if (gamemode == GAME_TRANSFUSION)
{
M_Background(640, 480);
- p = Draw_CachePic ("gfx/menu/tb-online", true);
+ p = Draw_CachePic ("gfx/menu/tb-online");
M_DrawPic (640/2 - p->width/2, 140, "gfx/menu/tb-online");
for (f = 1; f <= MULTIPLAYER_ITEMS; f++)
M_DrawPic (0, 180 + f*40, va("gfx/menu/online%i", f));
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/p_multi", true);
+ p = Draw_CachePic ("gfx/p_multi");
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
M_DrawPic (72, 32, "gfx/mp_menu");
}
-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_Draw (void)
{
- int i;
+ int i, j;
cachepic_t *p;
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/p_multi", true);
+ p = Draw_CachePic ("gfx/p_multi");
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
M_Print(64, 40, "Your name");
// LordHavoc: rewrote this code greatly
if (menuplyr_load)
{
- unsigned char *data, *f;
+ unsigned char *f;
fs_offset_t filesize;
menuplyr_load = false;
menuplyr_top = -1;
menuplyr_bottom = -1;
- if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize)))
+ f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize);
+ if (f && filesize >= 9)
{
- data = LoadLMP (f, filesize, 0, 0, true);
- menuplyr_width = image_width;
- menuplyr_height = image_height;
- Mem_Free(f);
- menuplyr_pixels = (unsigned char *)Mem_Alloc(cls.permanentmempool, menuplyr_width * menuplyr_height);
- menuplyr_translated = (unsigned int *)Mem_Alloc(cls.permanentmempool, menuplyr_width * menuplyr_height * 4);
- memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height);
- Mem_Free(data);
+ int width, height;
+ width = f[0] + f[1] * 256 + f[2] * 65536 + f[3] * 16777216;
+ height = f[4] + f[5] * 256 + f[6] * 65536 + f[7] * 16777216;
+ if (filesize >= 8 + width * height)
+ {
+ menuplyr_width = width;
+ menuplyr_height = height;
+ menuplyr_pixels = (unsigned char *)Mem_Alloc(cls.permanentmempool, width * height);
+ menuplyr_translated = (unsigned int *)Mem_Alloc(cls.permanentmempool, width * height * 4);
+ memcpy(menuplyr_pixels, f + 8, width * height);
+ }
}
+ if (f)
+ Mem_Free(f);
}
if (menuplyr_pixels)
{
menuplyr_top = setup_top;
menuplyr_bottom = setup_bottom;
- M_BuildTranslationTable(menuplyr_top*16, menuplyr_bottom*16);
+
for (i = 0;i < menuplyr_width * menuplyr_height;i++)
- menuplyr_translated[i] = palette_transparent[translationTable[menuplyr_pixels[i]]];
+ {
+ j = menuplyr_pixels[i];
+ if (j >= TOP_RANGE && j < TOP_RANGE + 16)
+ {
+ if (menuplyr_top < 8 || menuplyr_top == 14)
+ j = menuplyr_top * 16 + (j - TOP_RANGE);
+ else
+ j = menuplyr_top * 16 + 15-(j - TOP_RANGE);
+ }
+ else if (j >= BOTTOM_RANGE && j < BOTTOM_RANGE + 16)
+ {
+ if (menuplyr_bottom < 8 || menuplyr_bottom == 14)
+ j = menuplyr_bottom * 16 + (j - BOTTOM_RANGE);
+ else
+ j = menuplyr_bottom * 16 + 15-(j - BOTTOM_RANGE);
+ }
+ menuplyr_translated[i] = palette_bgra_transparent[j];
+ }
Draw_NewPic("gfx/menuplyr", menuplyr_width, menuplyr_height, true, (unsigned char *)menuplyr_translated);
}
M_DrawPic(160, 48, "gfx/bigbox");
}
-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, "%.2f", num);
+ dpsnprintf(text, sizeof(text), "%.3f", num);
M_Print(x + (SLIDER_RANGE+2) * 8, y, text);
}
}
-#define OPTIONS_ITEMS 38
+//#define OPTIONS_ITEMS 25 aule was here
+#define OPTIONS_ITEMS 27
+
static int options_cursor;
extern dllhandle_t jpeg_dll;
extern cvar_t gl_texture_anisotropy;
extern cvar_t r_textshadow;
+extern cvar_t r_hdr_scenebrightness;
static void M_Menu_Options_AdjustSliders (int dir)
{
int optnum;
+ double f;
S_LocalSound ("sound/misc/menu3.wav");
- optnum = 7;
- if (options_cursor == optnum++)
- Cvar_SetValueQuick (&vid_conwidth, bound(320, vid_conwidth.value + dir * 64, 2048));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&vid_conheight, bound(240, vid_conheight.value + dir * 48, 1536));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_conalpha, bound(0, scr_conalpha.value + dir * 0.2, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_conbrightness, bound(0, scr_conbrightness.value + dir * 0.2, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&sbar_alpha_bg, bound(0, sbar_alpha_bg.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&sbar_alpha_fg, bound(0, sbar_alpha_fg.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_fov, bound(1, scr_fov.integer + dir * 1, 170));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_screenshot_gammaboost, bound(0.1, scr_screenshot_gammaboost.value + dir * 0.1, 4));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&r_sky, !r_sky.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.integer + dir, gl_max_anisotropy));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&snd_staticvolume, bound(0, snd_staticvolume.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&r_textshadow, !r_textshadow.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 6));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&showfps, !showfps.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&showtime, !showtime.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&showdate, !showdate.integer);
+ optnum = 0;
+ if (options_cursor == optnum++) ;
+ 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, 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));
else if (options_cursor == optnum++)
{
if (cl_forwardspeed.value > 200)
Cvar_SetValueQuick (&cl_backspeed, 400);
}
}
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&lookspring, !lookspring.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&freelook, !freelook.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&showfps, !showfps.integer);
+ else if (options_cursor == optnum++) {f = !(showdate.integer && showtime.integer);Cvar_SetValueQuick(&showdate, f);Cvar_SetValueQuick(&showtime, f);}
+ else if (options_cursor == optnum++) ;
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&r_hdr_scenebrightness, bound(1, r_hdr_scenebrightness.value + dir * 0.0625, 4));
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&v_contrast, bound(1, v_contrast.value + dir * 0.0625, 4));
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&v_gamma, bound(0.5, v_gamma.value + dir * 0.0625, 3));
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&volume, bound(0, volume.value + dir * 0.0625, 1));
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&bgmvolume, bound(0, bgmvolume.value + dir * 0.0625, 1));
}
static int optnum;
{
if (opty >= 32)
{
- DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
- M_ItemPrint(0, opty, s, enabled);
+ if (optnum == optcursor)
+ DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ M_ItemPrint(0 + 48, opty, s, enabled);
}
opty += 8;
optnum++;
{
if (opty >= 32)
{
- DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
- M_ItemPrint(0, opty, s, enabled);
- M_DrawCheckbox(0 + (int)strlen(s) * 8 + 8, opty, yes);
+ if (optnum == optcursor)
+ DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ M_ItemPrint(0 + 48, opty, s, enabled);
+ M_DrawCheckbox(0 + 48 + (int)strlen(s) * 8 + 8, opty, yes);
}
opty += 8;
optnum++;
{
if (opty >= 32)
{
- DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
- M_ItemPrint(0, opty, s, enabled);
- M_DrawSlider(0 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
+ if (optnum == optcursor)
+ DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ M_ItemPrint(0 + 48, opty, s, enabled);
+ M_DrawSlider(0 + 48 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
}
opty += 8;
optnum++;
M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", true);
+ p = Draw_CachePic ("gfx/p_option");
M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optnum = 0;
visible = (int)((menu_height - 32) / 8);
opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8;
- M_Options_PrintCommand( "Customize controls", true);
- M_Options_PrintCommand( " Go to console", true);
- M_Options_PrintCommand( " Reset to defaults", true);
- M_Options_PrintCommand( " Video", true);
- M_Options_PrintCommand( " Effects", true);
- M_Options_PrintCommand( " Graphics", true);
- M_Options_PrintCommand( " Color Control", true);
- M_Options_PrintSlider( " 2D Screen Width ", true, vid_conwidth.value, 320, 2048);
- M_Options_PrintSlider( " 2D Screen Height", true, vid_conheight.value, 240, 1536);
- M_Options_PrintSlider( " Console Alpha", true, scr_conalpha.value, 0, 1);
- M_Options_PrintSlider( "Conback Brightness", true, scr_conbrightness.value, 0, 1);
- M_Options_PrintSlider( " Sbar Alpha BG", true, sbar_alpha_bg.value, 0, 1);
- M_Options_PrintSlider( " Sbar Alpha FG", true, sbar_alpha_fg.value, 0, 1);
- M_Options_PrintSlider( " Screen size", true, scr_viewsize.value, 30, 120);
- M_Options_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170);
- M_Options_PrintCheckbox(" JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer);
- M_Options_PrintSlider( " JPEG quality", jpeg_dll != NULL, scr_screenshot_jpeg_quality.value, 0, 1);
- M_Options_PrintSlider( " Screenshot Gamma", jpeg_dll != NULL, scr_screenshot_gammaboost.value, 0.1, 4);
- M_Options_PrintCheckbox(" Sky", true, r_sky.integer);
- M_Options_PrintCheckbox(" Dithering", true, gl_dither.integer);
- M_Options_PrintSlider( "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
- M_Options_PrintSlider( " Game Speed", sv.active, slowmo.value, 0, 5);
- M_Options_PrintSlider( " CD Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
- M_Options_PrintSlider( " Sound Volume", snd_initialized.integer, volume.value, 0, 1);
- M_Options_PrintSlider(gamemode == GAME_GOODVSBAD2 ? " Music Volume" : " Ambient Volume", snd_initialized.integer, snd_staticvolume.value, 0, 1);
- M_Options_PrintCheckbox(" Text Shadow", true, r_textshadow.integer);
- M_Options_PrintSlider( " Crosshair", true, crosshair.value, 0, 5);
- M_Options_PrintSlider( " Crosshair Size", true, crosshair_size.value, 1, 5);
- M_Options_PrintCheckbox(" Show Framerate", true, showfps.integer);
- M_Options_PrintCheckbox(" Show Time", true, showtime.integer);
- M_Options_PrintCheckbox(" Show Date", true, showdate.integer);
- M_Options_PrintCheckbox(" Always Run", true, cl_forwardspeed.value > 200);
- M_Options_PrintCheckbox(" Lookspring", true, lookspring.integer);
- M_Options_PrintCheckbox(" Lookstrafe", true, lookstrafe.integer);
- M_Options_PrintSlider( " Mouse Speed", true, sensitivity.value, 1, 50);
- M_Options_PrintCheckbox(" Mouse Look", true, freelook.integer);
- M_Options_PrintCheckbox(" Invert Mouse", true, m_pitch.value < 0);
- M_Options_PrintCheckbox(" Use Mouse", true, vid_mouse.integer);
+ M_Options_PrintCommand( " Customize controls", true);
+ 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, 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);
+ M_Options_PrintCheckbox(" Always Run", true, cl_forwardspeed.value > 200);
+ M_Options_PrintCheckbox(" Show Framerate", true, showfps.integer);
+ M_Options_PrintCheckbox(" Show Date and Time", true, showdate.integer && showtime.integer);
+ M_Options_PrintCommand( " Custom Brightness", true);
+ M_Options_PrintSlider( " Game Brightness", true, r_hdr_scenebrightness.value, 1, 4);
+ M_Options_PrintSlider( " Brightness", true, v_contrast.value, 1, 2);
+ M_Options_PrintSlider( " Gamma", true, v_gamma.value, 0.5, 3);
+ M_Options_PrintSlider( " Sound Volume", snd_initialized.integer, volume.value, 0, 1);
+ M_Options_PrintSlider( " Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
+ M_Options_PrintCommand( " Customize Effects", true);
+ M_Options_PrintCommand( " Effects: Quake", true);
+ M_Options_PrintCommand( " Effects: Normal", true);
+ M_Options_PrintCommand( " Effects: High", true);
+ M_Options_PrintCommand( " Customize Lighting", true);
+ M_Options_PrintCommand( " Lighting: Flares", true);
+ M_Options_PrintCommand( " Lighting: Normal", true);
+ M_Options_PrintCommand( " Lighting: High", true);
+ M_Options_PrintCommand( " Lighting: Full", true);
+ M_Options_PrintCommand( " Browse Mods", true);
}
-static void M_Options_Key (int k, char ascii)
+static void M_Options_Key (int k, int ascii)
{
switch (k)
{
case 3:
M_Menu_Video_f ();
break;
- case 4:
+ case 11:
+ M_Menu_Options_ColorControl_f ();
+ break;
+ case 17: // Customize Effects
M_Menu_Options_Effects_f ();
break;
- case 5:
+ case 18: // Effects: Quake
+ Cbuf_AddText("cl_particles 1;cl_particles_quake 1;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 0;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 0;cl_beams_polygons 0;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
+ break;
+ case 19: // Effects: Normal
+ Cbuf_AddText("cl_particles 1;cl_particles_quake 0;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
+ break;
+ case 20: // Effects: High
+ Cbuf_AddText("cl_particles 1;cl_particles_quake 0;cl_particles_quality 2;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 1;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
+ break;
+ case 21:
M_Menu_Options_Graphics_f ();
break;
- case 6:
- M_Menu_Options_ColorControl_f ();
+ case 22: // Lighting: Flares
+ Cbuf_AddText("r_coronas 1;gl_flashblend 1;r_shadow_gloss 0;r_shadow_realtime_dlight 0;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
+ break;
+ case 23: // Lighting: Normal
+ Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
+ break;
+ case 24: // Lighting: High
+ Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
+ break;
+ case 25: // Lighting: Full
+ Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
+ break;
+ case 26:
+ M_Menu_ModList_f ();
break;
default:
M_Menu_Options_AdjustSliders (1);
}
}
-#define OPTIONS_EFFECTS_ITEMS 36
+#define OPTIONS_EFFECTS_ITEMS 35
static int options_effects_cursor;
S_LocalSound ("sound/misc/menu3.wav");
optnum = 0;
- if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
- else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
- else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
+ if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quake, !cl_particles_quake.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_explosions_shell, !cl_particles_explosions_shell.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_qmbtexture, !r_lightningbeam_qmbtexture.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpmodels, !r_lerpmodels.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpsprites, !r_lerpsprites.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerplightstyles, !r_lerplightstyles.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_polyblend, bound(0, gl_polyblend.value + dir * 0.1, 1));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_skyscroll1, bound(-8, r_skyscroll1.value + dir * 0.1, 8));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_skyscroll2, bound(-8, r_skyscroll2.value + dir * 0.1, 8));
M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", true);
+ p = Draw_CachePic ("gfx/p_option");
M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optcursor = options_effects_cursor;
visible = (int)((menu_height - 32) / 8);
opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8;
- M_Options_PrintSlider( " Corona Intensity", true, r_coronas.value, 0, 4);
- M_Options_PrintCheckbox(" Use Only Coronas", true, gl_flashblend.integer);
M_Options_PrintCheckbox(" Particles", true, cl_particles.integer);
M_Options_PrintCheckbox(" Quake-style Particles", true, cl_particles_quake.integer);
M_Options_PrintSlider( " Particles Quality", true, cl_particles_quality.value, 1, 4);
M_Options_PrintCheckbox(" Lightning QMB Texture", cl_beams_polygons.integer, r_lightningbeam_qmbtexture.integer);
M_Options_PrintCheckbox(" Model Interpolation", true, r_lerpmodels.integer);
M_Options_PrintCheckbox(" Sprite Interpolation", true, r_lerpsprites.integer);
+ M_Options_PrintCheckbox(" Flicker Interpolation", true, r_lerplightstyles.integer);
M_Options_PrintSlider( " View Blend", true, gl_polyblend.value, 0, 1);
M_Options_PrintSlider( "Upper Sky Scroll Speed", true, r_skyscroll1.value, -8, 8);
M_Options_PrintSlider( "Lower Sky Scroll Speed", true, r_skyscroll2.value, -8, 8);
}
-static void M_Options_Effects_Key (int k, char ascii)
+static void M_Options_Effects_Key (int k, int ascii)
{
switch (k)
{
extern cvar_t r_shadow_realtime_dlight;
extern cvar_t r_shadow_realtime_dlight_shadows;
extern cvar_t r_shadow_realtime_world;
-extern cvar_t r_shadow_realtime_world_dlightshadows;
extern cvar_t r_shadow_realtime_world_lightmaps;
extern cvar_t r_shadow_realtime_world_shadows;
extern cvar_t r_bloom;
optnum = 0;
- if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss, bound(0, r_shadow_gloss.integer + dir, 2));
+ if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss, bound(0, r_shadow_gloss.integer + dir, 2));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight, !r_shadow_realtime_dlight.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight_shadows, !r_shadow_realtime_dlight_shadows.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world, !r_shadow_realtime_world.integer);
- else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_dlightshadows, !r_shadow_realtime_world_dlightshadows.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps, bound(0, r_shadow_realtime_world_lightmaps.value + dir * 0.1, 1));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_shadows, !r_shadow_realtime_world_shadows.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_scenebrightness, bound(0.25, r_hdr_scenebrightness.value + dir * 0.125, 4));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_glowintensity, bound(0, r_hdr_glowintensity.value + dir * 0.25, 4));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorscale, bound(0.0625, r_bloom_colorscale.value + dir * 0.0625, 1));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorsubtract, bound(0, r_bloom_colorsubtract.value + dir * 0.0625, 1-0.0625));
- else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorexponent, bound(1, r_bloom_colorexponent.value *= (dir > 0 ? 2 : 0.5), 8));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorexponent, bound(1, r_bloom_colorexponent.value * (dir > 0 ? 2.0 : 0.5), 8));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_brighten, bound(1, r_bloom_brighten.value + dir * 0.0625, 4));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_blur, bound(1, r_bloom_blur.value + dir * 1, 16));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_resolution, bound(64, r_bloom_resolution.value + dir * 64, 2048));
- else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
else if (options_graphics_cursor == optnum++) Cbuf_AddText ("r_restart\n");
}
M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", true);
+ p = Draw_CachePic ("gfx/p_option");
M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optcursor = options_graphics_cursor;
visible = (int)((menu_height - 32) / 8);
opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8;
- M_Options_PrintSlider( " Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
- M_Options_PrintCheckbox(" RT DLights", true, r_shadow_realtime_dlight.integer);
- M_Options_PrintCheckbox(" RT DLight Shadows", true, r_shadow_realtime_dlight_shadows.integer);
- M_Options_PrintCheckbox(" RT World", true, r_shadow_realtime_world.integer);
- M_Options_PrintCheckbox("RT World DLight Shadows", true, r_shadow_realtime_world_dlightshadows.integer);
- M_Options_PrintSlider( " RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1);
- M_Options_PrintCheckbox(" RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
- M_Options_PrintSlider( " Scene Brightness", true, r_hdr_scenebrightness.value, 0.25, 4);
- M_Options_PrintCheckbox(" Bloom Effect", !r_hdr.integer, r_bloom.integer);
- M_Options_PrintCheckbox(" HDR Bloom Effect", r_hdr.integer, r_hdr.integer);
- M_Options_PrintSlider( " HDR Dynamic Range", true, r_hdr_range.value, 1, 16);
- M_Options_PrintSlider( " HDR Glow Intensity", r_hdr.integer, r_hdr_glowintensity.value, 0, 4);
- M_Options_PrintSlider( " Bloom Color Scale", r_hdr.integer || r_bloom.integer, r_bloom_colorscale.value, 0.0625, 1);
- M_Options_PrintSlider( " Bloom Color Subtract", r_hdr.integer || r_bloom.integer, r_bloom_colorsubtract.value, 0, 1-0.0625);
- M_Options_PrintSlider( " Bloom Color Exponent", r_hdr.integer || r_bloom.integer, r_bloom_colorexponent.value, 1, 8);
- M_Options_PrintSlider( " Bloom Intensity", r_hdr.integer || r_bloom.integer, r_bloom_brighten.value, 1, 4);
- M_Options_PrintSlider( " Bloom Blur", r_hdr.integer || r_bloom.integer, r_bloom_blur.value, 1, 16);
- M_Options_PrintSlider( " Bloom Resolution", r_hdr.integer || r_bloom.integer, r_bloom_resolution.value, 64, 2048);
- M_Options_PrintSlider( " Texture Quality", true, gl_picmip.value, 3, 0);
- M_Options_PrintCommand( " Restart Renderer", true);
+ M_Options_PrintSlider( " Corona Intensity", true, r_coronas.value, 0, 4);
+ M_Options_PrintCheckbox(" Use Only Coronas", true, gl_flashblend.integer);
+ M_Options_PrintSlider( " Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
+ M_Options_PrintCheckbox(" RT DLights", !gl_flashblend.integer, r_shadow_realtime_dlight.integer);
+ M_Options_PrintCheckbox(" RT DLight Shadows", !gl_flashblend.integer, r_shadow_realtime_dlight_shadows.integer);
+ M_Options_PrintCheckbox(" RT World", true, r_shadow_realtime_world.integer);
+ M_Options_PrintSlider( " RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1);
+ M_Options_PrintCheckbox(" RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
+ M_Options_PrintSlider( " Scene Brightness", true, r_hdr_scenebrightness.value, 0.25, 4);
+ M_Options_PrintCheckbox(" Bloom Effect", !r_hdr.integer, r_bloom.integer);
+ M_Options_PrintCheckbox(" HDR Bloom Effect", true, r_hdr.integer);
+ M_Options_PrintSlider( " HDR Dynamic Range", r_hdr.integer, r_hdr_range.value, 1, 16);
+ M_Options_PrintSlider( " HDR Glow Intensity", r_hdr.integer, r_hdr_glowintensity.value, 0, 4);
+ M_Options_PrintSlider( " Bloom Color Scale", r_hdr.integer || r_bloom.integer, r_bloom_colorscale.value, 0.0625, 1);
+ M_Options_PrintSlider( " Bloom Color Subtract", r_hdr.integer || r_bloom.integer, r_bloom_colorsubtract.value, 0, 1-0.0625);
+ M_Options_PrintSlider( " Bloom Color Exponent", r_hdr.integer || r_bloom.integer, r_bloom_colorexponent.value, 1, 8);
+ M_Options_PrintSlider( " Bloom Intensity", r_hdr.integer || r_bloom.integer, r_bloom_brighten.value, 1, 4);
+ M_Options_PrintSlider( " Bloom Blur", r_hdr.integer || r_bloom.integer, r_bloom_blur.value, 1, 16);
+ M_Options_PrintSlider( " Bloom Resolution", r_hdr.integer || r_bloom.integer, r_bloom_resolution.value, 64, 2048);
+ M_Options_PrintCommand( " Restart Renderer", true);
}
-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", true);
+ dither = Draw_CachePic_Flags ("gfx/colorcontrol/ditherpattern", CACHEPICFLAG_NOCLAMP);
M_Background(320, 256);
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", true);
+ p = Draw_CachePic ("gfx/p_option");
M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optcursor = options_colorcontrol_cursor;
M_Options_PrintSlider( " White: Grey ", v_color_enable.integer, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3, 1, 5);
opty += 4;
- DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);opty += 4;
+ DrawQ_Fill(menu_x, menu_y + opty, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);opty += 4;
s = (float) 312 / 2 * vid.width / vid_conwidth.integer;
t = (float) 4 / 2 * vid.height / vid_conheight.integer;
DrawQ_SuperPic(menu_x + 4, menu_y + opty, dither, 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);opty += 4;
v = t * 0.5;
opty += 8;
x = 4;
- DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, c, 0, 0, 1, 0);
+ DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, 0, 0, 1, 0);
DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);
DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0);
x += 80;
- DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, 0, c, 0, 1, 0);
+ DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, c, 0, 1, 0);
DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);
DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0);
x += 80;
- DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, 0, 0, c, 1, 0);
+ DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, 0, c, 1, 0);
DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);
DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0);
x += 80;
- DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, c, c, c, 1, 0);
+ DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, c, c, 1, 0);
DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);
DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0);
}
-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
*b = Z_Alloc(sizeof(binditem_t) + strlen(command) + 1 + strlen(description) + 1);
*b->command = (char *)((*b) + 1);
*b->description = *b->command + strlen(command) + 1;
- strcpy(*b->command, command);
- strcpy(*b->description, description);
+ strlcpy(*b->command, command, strlen(command) + 1);
+ strlcpy(*b->description, description, strlen(description) + 1);
}
static void M_AddBind (char *category, char *command, char *description)
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++)
{
M_Background(320, 48 + 8 * numcommands);
- p = Draw_CachePic ("gfx/ttl_cstm", true);
+ p = Draw_CachePic ("gfx/ttl_cstm");
M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm");
if (bind_grab)
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
-typedef struct video_resolution_s
-{
- const char *type;
- int width, height;
- int conwidth, conheight;
- double pixelheight; // pixel aspect
-}
-video_resolution_t;
-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 7
+#define VIDEO_ITEMS 11
static int video_cursor = 0;
-static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162};
-static int video_resolution;
+static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152, 168};
+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");
- p = Draw_CachePic("gfx/vidmodes", true);
+ p = Draw_CachePic ("gfx/vidmodes");
M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes");
- // Current Resolution
- M_Print(16, video_cursor_table[0], " Current Resolution");
- if (vid_supportrefreshrate && vid.fullscreen)
- M_Print(220, video_cursor_table[0], va("%dx%d %dhz", vid.width, vid.height, vid.refreshrate));
+ t = 0;
+
+ // 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 %.2fhz", vid.width, vid.height, vid.refreshrate));
else
- M_Print(220, video_cursor_table[0], va("%dx%d", vid.width, vid.height));
+ 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", 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++;
- // Proposed Resolution
- M_Print(16, video_cursor_table[1], " New Resolution");
- M_Print(220, video_cursor_table[1], va("%dx%d", video_resolutions[video_resolution].width, video_resolutions[video_resolution].height));
- M_Print(96, video_cursor_table[1] + 8, va("Type: %s", video_resolutions[video_resolution].type));
+ // Bits per pixel
+ M_Print(16, video_cursor_table[t], " Bits per pixel");
+ M_Print(220, video_cursor_table[t], (vid_bitsperpixel.integer == 32) ? "32" : "16");
+ t++;
// Bits per pixel
- M_Print(16, video_cursor_table[2], " Bits per pixel");
- M_Print(220, video_cursor_table[2], (vid_bitsperpixel.integer == 32) ? "32" : "16");
+ M_Print(16, video_cursor_table[t], " Antialiasing");
+ M_DrawSlider(220, video_cursor_table[t], vid_samples.value, 1, 32);
+ t++;
// Refresh Rate
- M_ItemPrint(16, video_cursor_table[3], " Refresh Rate", vid_supportrefreshrate);
- M_DrawSlider(220, video_cursor_table[3], vid_refreshrate.integer, 60, 150);
+ M_ItemPrint(16, video_cursor_table[t], " Use Refresh Rate", vid_supportrefreshrate);
+ M_DrawCheckbox(220, video_cursor_table[t], vid_userefreshrate.integer);
+ t++;
- // Fullscreen
- M_Print(16, video_cursor_table[4], " Fullscreen");
- M_DrawCheckbox(220, video_cursor_table[4], vid_fullscreen.integer);
+ // 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.value, 50, 150);
+ t++;
- // "Apply" button
- M_Print(220, video_cursor_table[5], "Apply");
+ // Fullscreen
+ M_Print(16, video_cursor_table[t], " Fullscreen");
+ M_DrawCheckbox(220, video_cursor_table[t], vid_fullscreen.integer);
+ t++;
// Vertical Sync
- M_ItemPrint(16, video_cursor_table[6], " Vertical Sync", gl_videosyncavailable);
- M_DrawCheckbox(220, video_cursor_table[6], vid_vsync.integer);
+ 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", 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", vid.support.arb_texture_compression);
+ M_DrawCheckbox(220, video_cursor_table[t], gl_texturecompression.integer);
+ t++;
+
+ // "Apply" button
+ M_Print(220, video_cursor_table[t], "Apply");
+ t++;
// Cursor
M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
static void M_Menu_Video_AdjustSliders (int dir)
{
+ int t;
+
S_LocalSound ("sound/misc/menu3.wav");
- switch (video_cursor)
+ t = 0;
+ if (video_cursor == t++)
{
// Resolution
- case 1:
+ int r;
+ for(r = 0;r < menu_video_resolutions_count;r++)
{
- int r;
- for(r = 0;r < VID_RES_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)
- break;
- }
- break;
+ 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;
}
-
- // Bits per pixel
- case 2:
- Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32);
- break;
- // Refresh Rate
- case 3:
- Cvar_SetValueQuick (&vid_refreshrate, vid_refreshrate.integer + dir);
- break;
- case 4:
- Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
- break;
-
- case 6:
- Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
- break;
}
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32);
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&vid_samples, bound(1, vid_samples.value * (dir > 0 ? 2 : 0.5), 32));
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&vid_userefreshrate, !vid_userefreshrate.integer);
+ else if (video_cursor == t++)
+ 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), vid.max_anisotropy));
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&gl_texturecompression, !gl_texturecompression.integer);
}
-static void M_Video_Key (int key, char ascii)
+static void M_Video_Key (int key, int ascii)
{
switch (key)
{
// vid_shared.c has a copy of the current video config. We restore it
Cvar_SetValueQuick(&vid_fullscreen, vid.fullscreen);
Cvar_SetValueQuick(&vid_bitsperpixel, vid.bitsperpixel);
+ Cvar_SetValueQuick(&vid_samples, vid.samples);
if (vid_supportrefreshrate)
Cvar_SetValueQuick(&vid_refreshrate, vid.refreshrate);
+ Cvar_SetValueQuick(&vid_userefreshrate, vid.userefreshrate);
S_LocalSound ("sound/misc/menu1.wav");
M_Menu_Options_f ();
m_entersound = true;
switch (video_cursor)
{
- case 5:
- 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);
+ case (VIDEO_ITEMS - 1):
+ 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)
{
int n;
if (m_state == m_quit)
return;
- wasInMenus = (key_dest == key_menu);
+ wasInMenus = (key_dest == key_menu || key_dest == key_menu_grabbed);
key_dest = key_menu;
m_quit_prevstate = m_state;
m_state = m_quit;
}
-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);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/p_multi", true);
+ p = Draw_CachePic ("gfx/p_multi");
basex = (320-p->width)/2;
M_DrawPic (basex, 4, "gfx/p_multi");
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_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/p_multi", true);
+ p = Draw_CachePic ("gfx/p_multi");
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
M_DrawTextBox (152, 32, 10, 1);
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;
}
static void M_ServerList_Draw (void)
{
- int n, y, visible, start, end;
+ int n, y, visible, start, end, numplayers, maxplayers;
cachepic_t *p;
const char *s;
else
M_Background(640, vid_conheight.integer);
// scroll the list as the cursor moves
- s = va("%i/%i masters %i/%i servers", masterreplycount, masterquerycount, serverreplycount, serverquerycount);
+ ServerList_GetPlayerStatistics(&numplayers, &maxplayers);
+ s = va("%i/%i masters %i/%i servers %i/%i players", masterreplycount, masterquerycount, serverreplycount, serverquerycount, numplayers, maxplayers);
M_PrintRed((640 - strlen(s) * 8) / 2, 32, s);
if (*m_return_reason)
M_Print(16, menu_height - 8, m_return_reason);
start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible);
end = min(start + visible, serverlist_viewcount);
- p = Draw_CachePic("gfx/p_multi", true);
+ p = Draw_CachePic ("gfx/p_multi");
M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi");
if (end > start)
{
for (n = start;n < end;n++)
{
- DrawQ_Pic(menu_x, menu_y + y, NULL, 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;
+ 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, 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:
+ break;
+ }
+
+}
+
+//=============================================================================
+/* MODLIST MENU */
+// same limit of mod dirs as in fs.c
+#define MODLIST_MAXDIRS 16
+static int modlist_enabled [MODLIST_MAXDIRS]; //array of indexs to modlist
+static int modlist_numenabled; //number of enabled (or in process to be..) mods
+
+typedef struct modlist_entry_s
+{
+ qboolean loaded; // used to determine whether this entry is loaded and running
+ int enabled; // index to array of modlist_enabled
+
+ // name of the modification, this is (will...be) displayed on the menu entry
+ char name[128];
+ // directory where we will find it
+ char dir[MAX_QPATH];
+} modlist_entry_t;
+
+static int modlist_cursor;
+//static int modlist_viewcount;
+
+static int modlist_count = 0;
+static modlist_entry_t modlist[MODLIST_TOTALSIZE];
+
+void ModList_RebuildList(void)
+{
+ int i,j;
+ stringlist_t list;
+
+ stringlistinit(&list);
+ listdirectory(&list, fs_basedir, "");
+ stringlistsort(&list);
+ modlist_count = 0;
+ modlist_numenabled = fs_numgamedirs;
+ for (i = 0;i < list.numstrings;i++)
+ {
+ 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
+ if (gamedirname1 && !strcasecmp(gamedirname1, 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], sizeof(modlist[modlist_count].dir));
+ //check currently loaded mods
+ modlist[modlist_count].loaded = false;
+ if (fs_numgamedirs)
+ for (j = 0; j < fs_numgamedirs; j++)
+ if (!strcasecmp(fs_gamedirs[j], modlist[modlist_count].dir))
+ {
+ modlist[modlist_count].loaded = true;
+ modlist[modlist_count].enabled = j;
+ modlist_enabled[j] = modlist_count;
+ break;
+ }
+ modlist_count ++;
+ }
+ stringlistfreecontents(&list);
+}
+
+void ModList_Enable (void)
+{
+ int i;
+ int numgamedirs;
+ char gamedirs[MODLIST_MAXDIRS][MAX_QPATH];
+
+ // copy our mod list into an array for FS_ChangeGameDirs
+ numgamedirs = modlist_numenabled;
+ for (i = 0; i < modlist_numenabled; i++)
+ strlcpy (gamedirs[i], modlist[modlist_enabled[i]].dir,sizeof (gamedirs[i]));
+
+ // this code snippet is from FS_ChangeGameDirs
+ if (fs_numgamedirs == numgamedirs)
+ {
+ for (i = 0;i < numgamedirs;i++)
+ if (strcasecmp(fs_gamedirs[i], gamedirs[i]))
+ break;
+ if (i == numgamedirs)
+ return; // already using this set of gamedirs, do nothing
+ }
+
+ // this part is basically the same as the FS_GameDir_f function
+ if ((cls.state == ca_connected && !cls.demoplayback) || sv.active)
+ {
+ // actually, changing during game would work fine, but would be stupid
+ Con_Printf("Can not change gamedir while client is connected or server is running!\n");
+ return;
+ }
+
+ FS_ChangeGameDirs (modlist_numenabled, gamedirs, true, true);
+}
+
+void M_Menu_ModList_f (void)
+{
+ key_dest = key_menu;
+ m_state = m_modlist;
+ m_entersound = true;
+ modlist_cursor = 0;
+ M_Update_Return_Reason("");
+ ModList_RebuildList();
+}
+
+static void M_Menu_ModList_AdjustSliders (int dir)
+{
+ int i;
+ S_LocalSound ("sound/misc/menu3.wav");
+
+ // stop adding mods, we reach the limit
+ if (!modlist[modlist_cursor].loaded && (modlist_numenabled == MODLIST_MAXDIRS)) return;
+ modlist[modlist_cursor].loaded = !modlist[modlist_cursor].loaded;
+ if (modlist[modlist_cursor].loaded)
+ {
+ modlist[modlist_cursor].enabled = modlist_numenabled;
+ //push the value on the enabled list
+ modlist_enabled[modlist_numenabled++] = modlist_cursor;
+ }
+ else
+ {
+ //eliminate the value from the enabled list
+ for (i = modlist[modlist_cursor].enabled; i < modlist_numenabled; i++)
+ {
+ modlist_enabled[i] = modlist_enabled[i+1];
+ modlist[modlist_enabled[i]].enabled--;
+ }
+ modlist_numenabled--;
+ }
+}
+
+static void M_ModList_Draw (void)
+{
+ int n, y, visible, start, end;
+ cachepic_t *p;
+ const char *s_available = "Available Mods";
+ const char *s_enabled = "Enabled Mods";
+
+ // use as much vertical space as available
+ if (gamemode == GAME_TRANSFUSION)
+ M_Background(640, vid_conheight.integer - 80);
+ else
+ M_Background(640, vid_conheight.integer);
+
+ M_PrintRed(48 + 32, 32, s_available);
+ M_PrintRed(432, 32, s_enabled);
+ // Draw a list box with all enabled mods
+ DrawQ_Pic(menu_x + 432, menu_y + 48, NULL, 172, 8 * modlist_numenabled, 0, 0, 0, 0.5, 0);
+ for (y = 0; y < modlist_numenabled; y++)
+ M_PrintRed(432, 48 + y * 8, modlist[modlist_enabled[y]].dir);
+
+ if (*m_return_reason)
+ M_Print(16, menu_height - 8, m_return_reason);
+ // scroll the list as the cursor moves
+ y = 48;
+ visible = (int)((menu_height - 16 - y) / 8 / 2);
+ start = bound(0, modlist_cursor - (visible >> 1), modlist_count - visible);
+ end = min(start + visible, modlist_count);
+
+ p = Draw_CachePic ("gfx/p_option");
+ M_DrawPic((640 - p->width) / 2, 4, "gfx/p_option");
+ if (end > start)
+ {
+ for (n = start;n < end;n++)
+ {
+ DrawQ_Pic(menu_x + 40, menu_y + y, NULL, 360, 8, n == modlist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ M_ItemPrint(80, y, modlist[n].dir, true);
+ M_DrawCheckbox(48, y, modlist[n].loaded);
+ y +=8;
+ }
+ }
+ else
+ {
+ M_Print(80, y, "No Mods found");
+ }
+}
+
+static void M_ModList_Key(int k, int ascii)
+{
+ switch (k)
+ {
+ case K_ESCAPE:
+ ModList_Enable ();
+ M_Menu_Options_f();
+ break;
+
+ case K_SPACE:
+ S_LocalSound ("sound/misc/menu2.wav");
+ ModList_RebuildList();
+ break;
+
+ case K_UPARROW:
+ S_LocalSound ("sound/misc/menu1.wav");
+ modlist_cursor--;
+ if (modlist_cursor < 0)
+ modlist_cursor = modlist_count - 1;
+ break;
+
+ case K_LEFTARROW:
+ M_Menu_ModList_AdjustSliders (-1);
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("sound/misc/menu1.wav");
+ modlist_cursor++;
+ if (modlist_cursor >= modlist_count)
+ modlist_cursor = 0;
+ break;
+
+ case K_RIGHTARROW:
+ M_Menu_ModList_AdjustSliders (1);
+ break;
+
+ case K_ENTER:
+ S_LocalSound ("sound/misc/menu2.wav");
+ ModList_Enable ();
break;
default:
//=============================================================================
/* 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_keys", M_Menu_Keys_f, "open the key binding menu");
Cmd_AddCommand ("menu_video", M_Menu_Video_f, "open the video options menu");
Cmd_AddCommand ("menu_reset", M_Menu_Reset_f, "open the reset to defaults menu");
+ Cmd_AddCommand ("menu_mods", M_Menu_ModList_f, "open the mods browser menu");
Cmd_AddCommand ("help", M_Menu_Help_f, "open the help menu");
Cmd_AddCommand ("menu_quit", M_Menu_Quit_f, "open the quit menu");
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)
{
- if (key_dest != key_menu)
+ if (key_dest != key_menu && key_dest != key_menu_grabbed)
m_state = m_none;
if (m_state == m_none)
case m_slist:
M_ServerList_Draw ();
break;
+
+ case m_modlist:
+ M_ModList_Draw ();
+ break;
}
if (gamemode == GAME_TRANSFUSION && !m_missingdata) {
g = (int)(realtime * 64)%96;
scale_y_rate = (float)(g+1) / 96;
top_offset = (g+12)/12;
- p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset), true);
- drop1 = Draw_CachePic("gfx/menu/blooddrop1", true);
- drop2 = Draw_CachePic("gfx/menu/blooddrop2", true);
- drop3 = Draw_CachePic("gfx/menu/blooddrop3", true);
+ p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset));
+ drop1 = Draw_CachePic ("gfx/menu/blooddrop1");
+ drop2 = Draw_CachePic ("gfx/menu/blooddrop2");
+ drop3 = Draw_CachePic ("gfx/menu/blooddrop3");
for (scale_x = 0; scale_x <= vid_conwidth.integer; scale_x += p->width) {
for (scale_y = -scale_y_repeat; scale_y <= vid_conheight.integer; scale_y += scale_y_repeat) {
DrawQ_Pic (scale_x + 21, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0);
DrawQ_Pic (scale_x + 557, scale_y_repeat * .9425 + scale_y + scale_y_rate * scale_y_repeat, drop1, 0, 0, 1, 1, 1, 1, 0);
DrawQ_Pic (scale_x + 606, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop2, 0, 0, 1, 1, 1, 1, 0);
}
- DrawQ_Pic (scale_x, -1, Draw_CachePic(va("gfx/menu/blooddrip%i", top_offset), true), 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x, -1, Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset)), 0, 0, 1, 1, 1, 1, 0);
}
}
}
}
-void M_KeyEvent (int key, char ascii, qboolean downevent)
+void M_KeyEvent (int key, int ascii, qboolean downevent)
{
if (!downevent)
return;
M_Reset_Key (key, ascii);
return;
-
case m_video:
M_Video_Key (key, ascii);
return;
case m_slist:
M_ServerList_Key (key, ascii);
return;
+
+ case m_modlist:
+ M_ModList_Key (key, ascii);
+ 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",
"m_shutdown",
};
-#ifdef NG_MENU
-static qboolean m_displayed;
-#endif
-
static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*);
+static prvm_required_field_t m_required_fields[] =
+{
+#define PRVM_DECLARE_serverglobalfloat(x)
+#define PRVM_DECLARE_serverglobalvector(x)
+#define PRVM_DECLARE_serverglobalstring(x)
+#define PRVM_DECLARE_serverglobaledict(x)
+#define PRVM_DECLARE_serverglobalfunction(x)
+#define PRVM_DECLARE_clientglobalfloat(x)
+#define PRVM_DECLARE_clientglobalvector(x)
+#define PRVM_DECLARE_clientglobalstring(x)
+#define PRVM_DECLARE_clientglobaledict(x)
+#define PRVM_DECLARE_clientglobalfunction(x)
+#define PRVM_DECLARE_menuglobalfloat(x)
+#define PRVM_DECLARE_menuglobalvector(x)
+#define PRVM_DECLARE_menuglobalstring(x)
+#define PRVM_DECLARE_menuglobaledict(x)
+#define PRVM_DECLARE_menuglobalfunction(x)
+#define PRVM_DECLARE_serverfieldfloat(x)
+#define PRVM_DECLARE_serverfieldvector(x)
+#define PRVM_DECLARE_serverfieldstring(x)
+#define PRVM_DECLARE_serverfieldedict(x)
+#define PRVM_DECLARE_serverfieldfunction(x)
+#define PRVM_DECLARE_clientfieldfloat(x)
+#define PRVM_DECLARE_clientfieldvector(x)
+#define PRVM_DECLARE_clientfieldstring(x)
+#define PRVM_DECLARE_clientfieldedict(x)
+#define PRVM_DECLARE_clientfieldfunction(x)
+#define PRVM_DECLARE_menufieldfloat(x) {ev_float, #x},
+#define PRVM_DECLARE_menufieldvector(x) {ev_vector, #x},
+#define PRVM_DECLARE_menufieldstring(x) {ev_string, #x},
+#define PRVM_DECLARE_menufieldedict(x) {ev_entity, #x},
+#define PRVM_DECLARE_menufieldfunction(x) {ev_function, #x},
+#define PRVM_DECLARE_serverfunction(x)
+#define PRVM_DECLARE_clientfunction(x)
+#define PRVM_DECLARE_menufunction(x)
+#define PRVM_DECLARE_field(x)
+#define PRVM_DECLARE_global(x)
+#define PRVM_DECLARE_function(x)
+#include "prvm_offsets.h"
+#undef PRVM_DECLARE_serverglobalfloat
+#undef PRVM_DECLARE_serverglobalvector
+#undef PRVM_DECLARE_serverglobalstring
+#undef PRVM_DECLARE_serverglobaledict
+#undef PRVM_DECLARE_serverglobalfunction
+#undef PRVM_DECLARE_clientglobalfloat
+#undef PRVM_DECLARE_clientglobalvector
+#undef PRVM_DECLARE_clientglobalstring
+#undef PRVM_DECLARE_clientglobaledict
+#undef PRVM_DECLARE_clientglobalfunction
+#undef PRVM_DECLARE_menuglobalfloat
+#undef PRVM_DECLARE_menuglobalvector
+#undef PRVM_DECLARE_menuglobalstring
+#undef PRVM_DECLARE_menuglobaledict
+#undef PRVM_DECLARE_menuglobalfunction
+#undef PRVM_DECLARE_serverfieldfloat
+#undef PRVM_DECLARE_serverfieldvector
+#undef PRVM_DECLARE_serverfieldstring
+#undef PRVM_DECLARE_serverfieldedict
+#undef PRVM_DECLARE_serverfieldfunction
+#undef PRVM_DECLARE_clientfieldfloat
+#undef PRVM_DECLARE_clientfieldvector
+#undef PRVM_DECLARE_clientfieldstring
+#undef PRVM_DECLARE_clientfieldedict
+#undef PRVM_DECLARE_clientfieldfunction
+#undef PRVM_DECLARE_menufieldfloat
+#undef PRVM_DECLARE_menufieldvector
+#undef PRVM_DECLARE_menufieldstring
+#undef PRVM_DECLARE_menufieldedict
+#undef PRVM_DECLARE_menufieldfunction
+#undef PRVM_DECLARE_serverfunction
+#undef PRVM_DECLARE_clientfunction
+#undef PRVM_DECLARE_menufunction
+#undef PRVM_DECLARE_field
+#undef PRVM_DECLARE_global
+#undef PRVM_DECLARE_function
+};
+
+static int m_numrequiredfields = sizeof(m_required_fields) / sizeof(m_required_fields[0]);
+
+static prvm_required_field_t m_required_globals[] =
+{
+#define PRVM_DECLARE_serverglobalfloat(x)
+#define PRVM_DECLARE_serverglobalvector(x)
+#define PRVM_DECLARE_serverglobalstring(x)
+#define PRVM_DECLARE_serverglobaledict(x)
+#define PRVM_DECLARE_serverglobalfunction(x)
+#define PRVM_DECLARE_clientglobalfloat(x)
+#define PRVM_DECLARE_clientglobalvector(x)
+#define PRVM_DECLARE_clientglobalstring(x)
+#define PRVM_DECLARE_clientglobaledict(x)
+#define PRVM_DECLARE_clientglobalfunction(x)
+#define PRVM_DECLARE_menuglobalfloat(x) {ev_float, #x},
+#define PRVM_DECLARE_menuglobalvector(x) {ev_vector, #x},
+#define PRVM_DECLARE_menuglobalstring(x) {ev_string, #x},
+#define PRVM_DECLARE_menuglobaledict(x) {ev_entity, #x},
+#define PRVM_DECLARE_menuglobalfunction(x) {ev_function, #x},
+#define PRVM_DECLARE_serverfieldfloat(x)
+#define PRVM_DECLARE_serverfieldvector(x)
+#define PRVM_DECLARE_serverfieldstring(x)
+#define PRVM_DECLARE_serverfieldedict(x)
+#define PRVM_DECLARE_serverfieldfunction(x)
+#define PRVM_DECLARE_clientfieldfloat(x)
+#define PRVM_DECLARE_clientfieldvector(x)
+#define PRVM_DECLARE_clientfieldstring(x)
+#define PRVM_DECLARE_clientfieldedict(x)
+#define PRVM_DECLARE_clientfieldfunction(x)
+#define PRVM_DECLARE_menufieldfloat(x)
+#define PRVM_DECLARE_menufieldvector(x)
+#define PRVM_DECLARE_menufieldstring(x)
+#define PRVM_DECLARE_menufieldedict(x)
+#define PRVM_DECLARE_menufieldfunction(x)
+#define PRVM_DECLARE_serverfunction(x)
+#define PRVM_DECLARE_clientfunction(x)
+#define PRVM_DECLARE_menufunction(x)
+#define PRVM_DECLARE_field(x)
+#define PRVM_DECLARE_global(x)
+#define PRVM_DECLARE_function(x)
+#include "prvm_offsets.h"
+#undef PRVM_DECLARE_serverglobalfloat
+#undef PRVM_DECLARE_serverglobalvector
+#undef PRVM_DECLARE_serverglobalstring
+#undef PRVM_DECLARE_serverglobaledict
+#undef PRVM_DECLARE_serverglobalfunction
+#undef PRVM_DECLARE_clientglobalfloat
+#undef PRVM_DECLARE_clientglobalvector
+#undef PRVM_DECLARE_clientglobalstring
+#undef PRVM_DECLARE_clientglobaledict
+#undef PRVM_DECLARE_clientglobalfunction
+#undef PRVM_DECLARE_menuglobalfloat
+#undef PRVM_DECLARE_menuglobalvector
+#undef PRVM_DECLARE_menuglobalstring
+#undef PRVM_DECLARE_menuglobaledict
+#undef PRVM_DECLARE_menuglobalfunction
+#undef PRVM_DECLARE_serverfieldfloat
+#undef PRVM_DECLARE_serverfieldvector
+#undef PRVM_DECLARE_serverfieldstring
+#undef PRVM_DECLARE_serverfieldedict
+#undef PRVM_DECLARE_serverfieldfunction
+#undef PRVM_DECLARE_clientfieldfloat
+#undef PRVM_DECLARE_clientfieldvector
+#undef PRVM_DECLARE_clientfieldstring
+#undef PRVM_DECLARE_clientfieldedict
+#undef PRVM_DECLARE_clientfieldfunction
+#undef PRVM_DECLARE_menufieldfloat
+#undef PRVM_DECLARE_menufieldvector
+#undef PRVM_DECLARE_menufieldstring
+#undef PRVM_DECLARE_menufieldedict
+#undef PRVM_DECLARE_menufieldfunction
+#undef PRVM_DECLARE_serverfunction
+#undef PRVM_DECLARE_clientfunction
+#undef PRVM_DECLARE_menufunction
+#undef PRVM_DECLARE_field
+#undef PRVM_DECLARE_global
+#undef PRVM_DECLARE_function
+};
+
+static int m_numrequiredglobals = sizeof(m_required_globals) / sizeof(m_required_globals[0]);
+
void MR_SetRouting (qboolean forceold);
void MP_Error(const char *format, ...) DP_FUNC_PRINTF(1);
// init the normal menu now -> this will also correct the menu router pointers
MR_SetRouting (TRUE);
+ // reset the active scene, too (to be on the safe side ;))
+ R_SelectScene( RST_CLIENT );
+
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);
prog->globals.generic[OFS_PARM0] = (float) key;
prog->globals.generic[OFS_PARM1] = (float) ascii;
if (downevent)
- PRVM_ExecuteProgram(prog->funcoffsets.m_keydown,"m_keydown(float key, float ascii) required");
- else if (prog->funcoffsets.m_keyup)
- PRVM_ExecuteProgram(prog->funcoffsets.m_keyup,"m_keyup(float key, float ascii) required");
+ PRVM_ExecuteProgram(PRVM_menufunction(m_keydown),"m_keydown(float key, float ascii) required");
+ else if (PRVM_menufunction(m_keyup))
+ PRVM_ExecuteProgram(PRVM_menufunction(m_keyup),"m_keyup(float key, float ascii) required");
PRVM_End;
}
void MP_Draw (void)
{
+ // declarations that are needed right now
+
+ float oldquality;
+
+ R_SelectScene( RST_MENU );
+
+ // reset the temp entities each frame
+ r_refdef.scene.numtempentities = 0;
+
+ // menu scenes do not use reduced rendering quality
+ oldquality = r_refdef.view.quality;
+ r_refdef.view.quality = 1;
+ // TODO: this needs to be exposed to R_SetView (or something similar) ASAP [2/5/2008 Andreas]
+ r_refdef.scene.time = realtime;
+
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
- PRVM_ExecuteProgram(prog->funcoffsets.m_draw,"m_draw() required");
+ // FIXME: this really shouldnt error out lest we have a very broken refdef state...?
+ // or does it kill the server too?
+ PRVM_ExecuteProgram(PRVM_menufunction(m_draw),"m_draw() required");
PRVM_End;
+
+ // TODO: imo this should be moved into scene, too [1/27/2008 Andreas]
+ r_refdef.view.quality = oldquality;
+
+ R_SelectScene( RST_CLIENT );
}
-void MP_ToggleMenu_f (void)
+void MP_ToggleMenu(int mode)
{
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
-#ifdef NG_MENU
- m_displayed = !m_displayed;
- if( m_displayed )
- PRVM_ExecuteProgram(prog->funcoffsets.m_display,"m_display() required");
- else
- PRVM_ExecuteProgram(prog->funcoffsets.m_hide,"m_hide() required");
-#else
- PRVM_ExecuteProgram(prog->funcoffsets.m_toggle,"m_toggle() required");
-#endif
+ prog->globals.generic[OFS_PARM0] = (float) mode;
+ PRVM_ExecuteProgram(PRVM_menufunction(m_toggle),"m_toggle() required");
PRVM_End;
}
+void MP_NewMap(void)
+{
+ PRVM_Begin;
+ PRVM_SetProg(PRVM_MENUPROG);
+ if (PRVM_menufunction(m_newmap))
+ PRVM_ExecuteProgram(PRVM_menufunction(m_newmap),"m_newmap() required");
+ PRVM_End;
+}
+
void MP_Shutdown (void)
{
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
- PRVM_ExecuteProgram(prog->funcoffsets.m_shutdown,"m_shutdown() required");
+ PRVM_ExecuteProgram(PRVM_menufunction(m_shutdown),"m_shutdown() required");
// reset key_dest
key_dest = key_game;
PRVM_End;
}
-void MP_Fallback (void)
-{
- MP_Shutdown();
-
- key_dest = key_game;
-
- // init the normal menu now -> this will also correct the menu router pointers
- MR_SetRouting (TRUE);
-}
-
void MP_Init (void)
{
PRVM_Begin;
PRVM_InitProg(PRVM_MENUPROG);
- prog->headercrc = M_PROGHEADER_CRC;
prog->edictprivate_size = 0; // no private struct used
prog->name = M_NAME;
prog->num_edicts = 1;
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);
- PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, 0, NULL, 0, NULL);
+ PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, m_numrequiredfields, m_required_fields, m_numrequiredglobals, m_required_globals);
-#ifdef NG_MENU
- m_displayed = false;
-#endif
+ // 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_ExecuteProgram(PRVM_menufunction(m_init),"m_init() required");
PRVM_End;
}
-void MP_Restart(void)
-{
- MP_Init();
-}
-
//============================================================================
// Menu router
-static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)" };
-
-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 MR_Restart(void)
{
- MR_Shutdown ();
+ if(MR_Shutdown)
+ MR_Shutdown ();
MR_SetRouting (FALSE);
}
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);
- if (gamemode == GAME_NETHERWORLD)
- Cmd_AddCommand ("menu_fallback", MP_Fallback, "switch to engine menu (unload menu.dat)"); //Force to old-style menu
- 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"))
projects / xonotic / darkplaces.git / blobdiff