X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=b59b39a2c79f6bcc16c12ab95c5ad4b403e96a61;hb=3f42114b7c39aa725ee71230e8434acc79be74c2;hp=25e2ab55c0148332f2aac7d7a4227c31e9b73094;hpb=f39fed9f802790e3031eb9aa3e25d37b803116c1;p=xonotic%2Fdarkplaces.git diff --git a/menu.c b/menu.c index 25e2ab55..b59b39a2 100644 --- a/menu.c +++ b/menu.c @@ -301,9 +301,15 @@ void M_ToggleMenu_f (void) m_entersound = true; if (key_dest != key_menu || m_state != m_main) + { + if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "1")) + return; M_Menu_Main_f (); + } else { + if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "0")) + return; key_dest = key_game; m_state = m_none; } @@ -370,12 +376,15 @@ static void M_Demo_Key (int k, char ascii) /* MAIN MENU */ static int m_main_cursor; +static qboolean m_missingdata = false; static int MAIN_ITEMS = 4; // Nehahra: Menu Disable void M_Menu_Main_f (void) { + const char *s; + s = "gfx/mainmenu"; if (gamemode == GAME_NEHAHRA) { if (NehGameType == TYPE_DEMO) @@ -387,18 +396,22 @@ void M_Menu_Main_f (void) } else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item MAIN_ITEMS = 6; - else if (gamemode == GAME_TRANSFUSION) { + else if (gamemode == GAME_TRANSFUSION) + { + s = "gfx/menu/mainmenu1"; if (sv.active && !cl.intermission && cl.islocalgame) MAIN_ITEMS = 8; else MAIN_ITEMS = 7; } - else if (gamemode == GAME_NEXUIZ) { - MAIN_ITEMS = 2; - } else 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; + if (m_missingdata) + MAIN_ITEMS = 2; + /* if (key_dest != key_menu) { @@ -417,6 +430,23 @@ static void M_Main_Draw (void) int f; cachepic_t *p; + if (m_missingdata) + { + float y; + const char *s; + M_Background(640, 480); //fall back is always to 640x480, this makes it most readable at that. + y = 480/3-16; + s = "You have reached this menu due to missing or unlocatable content/data";M_PrintRed ((640-strlen(s)*8)*0.5, (480/3)-16, s);y+=8; + y+=8; + s = "You may consider adding";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8; + s = "-basedir /path/to/game";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8; + s = "to your launch commandline";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8; + M_Print (640/2 - 48, 480/2, "Open Console"); //The console usually better shows errors (failures) + M_Print (640/2 - 48, 480/2 + 8, "Quit"); + M_DrawCharacter(640/2 - 56, 480/2 + (8 * m_main_cursor), 12+((int)(realtime*4)&1)); + return; + } + if (gamemode == GAME_TRANSFUSION) { int y1, y2, y3; M_Background(640, 480); @@ -438,18 +468,7 @@ static void M_Main_Draw (void) M_DrawPic (0, 120 + m_main_cursor * 40, va("gfx/menu/mainmenu%iselected", y3)); return; } - else if (gamemode == GAME_NEXUIZ) - { - M_Background(640, 480); //fall back is always to 640x480, this makes it most readable at that. - M_PrintRed (40, (480/3)-16, "You have reached this menu due to missing or unlocatable content/data"); - M_Print ((640/2)-92, (480/3), "You may consider adding"); - M_Print ((640/2)-136, (480/3)+8, "-basedir /path/to/nexuiz"); - M_Print ((640/2)-76, (480/3)+16, "to your launch commandline"); - M_Print (640/2 - 48, 480/2, "Open Console"); //The console usually better shows errors (failures) - M_Print (640/2 - 48, 480/2 + 8, "Quit"); - M_DrawCharacter(640/2 - 56, 480/2 + (8 * m_main_cursor), 12+((int)(realtime*4)&1)); - return; - } + M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/ttl_main", true); @@ -500,7 +519,24 @@ static void M_Main_Key (int key, char ascii) case K_ENTER: m_entersound = true; - if (gamemode == GAME_NEHAHRA) + if (m_missingdata) + { + switch (m_main_cursor) + { + case 0: + if (cls.state == ca_connected) + { + m_state = m_none; + key_dest = key_game; + } + Con_ToggleConsole_f (); + break; + case 1: + M_Menu_Quit_f (); + break; + } + } + else if (gamemode == GAME_NEHAHRA) { switch (NehGameType) { @@ -687,22 +723,6 @@ static void M_Main_Key (int key, char ascii) } } } - else if (gamemode == GAME_NEXUIZ) { - switch (m_main_cursor) - { - case 0: - if (cls.state == ca_connected) - { - m_state = m_none; - key_dest = key_game; - } - Con_ToggleConsole_f (); - break; - case 1: - M_Menu_Quit_f (); - break; - } - } else { switch (m_main_cursor) @@ -860,7 +880,7 @@ static void M_ScanSaves (void) for (i=0 ; i> 4; setup_bottom = setup_oldbottom = cl_color.integer & 15; setup_rate = cl_rate.integer; @@ -1533,7 +1553,7 @@ static void M_DrawCheckbox (int x, int y, int on) } -#define OPTIONS_ITEMS 40 +#define OPTIONS_ITEMS 39 static int options_cursor; @@ -1597,8 +1617,6 @@ static void M_Menu_Options_AdjustSliders (int dir) 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 (&crosshair_static, !crosshair_static.integer); else if (options_cursor == optnum++) Cvar_SetValueQuick (&showfps, !showfps.integer); else if (options_cursor == optnum++) @@ -1715,7 +1733,6 @@ static void M_Options_Draw (void) 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(" Static Crosshair", true, crosshair_static.integer); M_Options_PrintCheckbox(" Show Framerate", true, showfps.integer); M_Options_PrintCheckbox(" Show Time", true, showtime.integer); M_Options_PrintCheckbox(" Show Date", true, showdate.integer); @@ -1794,7 +1811,7 @@ static void M_Options_Key (int k, char ascii) } } -#define OPTIONS_EFFECTS_ITEMS 35 +#define OPTIONS_EFFECTS_ITEMS 36 static int options_effects_cursor; @@ -1811,8 +1828,9 @@ extern cvar_t cl_stainmaps_clearonload; extern cvar_t r_explosionclip; extern cvar_t r_coronas; extern cvar_t gl_flashblend; -extern cvar_t cl_beams_polygon; -extern cvar_t cl_beams_relative; +extern cvar_t cl_beams_polygons; +extern cvar_t cl_beams_quakepositionhack; +extern cvar_t cl_beams_instantaimhack; extern cvar_t cl_beams_lightatend; extern cvar_t r_lightningbeam_thickness; extern cvar_t r_lightningbeam_scroll; @@ -1846,7 +1864,8 @@ static void M_Menu_Options_Effects_AdjustSliders (int dir) else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1)); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_polygons, !cl_beams_polygons.integer); - else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_relative, !cl_beams_relative.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_instantaimhack, !cl_beams_instantaimhack.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_quakepositionhack, !cl_beams_quakepositionhack.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_lightatend, !cl_beams_lightatend.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_thickness, bound(1, r_lightningbeam_thickness.integer + dir, 10)); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_scroll, bound(0, r_lightningbeam_scroll.integer + dir, 10)); @@ -1898,8 +1917,9 @@ static void M_Options_Effects_Draw (void) M_Options_PrintCheckbox(" Blood", true, cl_particles_blood.integer); M_Options_PrintSlider( " Blood Opacity", true, cl_particles_blood_alpha.value, 0.2, 1); M_Options_PrintCheckbox("Force New Blood Effect", true, cl_particles_blood_bloodhack.integer); - M_Options_PrintCheckbox(" Lightning Polygons", true, cl_beams_polygons.integer); - M_Options_PrintCheckbox("Lightning Smooth Sweep", true, cl_beams_relative.integer); + M_Options_PrintCheckbox(" Polygon Lightning", true, cl_beams_polygons.integer); + M_Options_PrintCheckbox("Smooth Sweep Lightning", true, cl_beams_instantaimhack.integer); + M_Options_PrintCheckbox(" Waist-level Lightning", true, cl_beams_quakepositionhack.integer); M_Options_PrintCheckbox(" Lightning End Light", true, cl_beams_lightatend.integer); M_Options_PrintSlider( " Lightning Thickness", cl_beams_polygons.integer, r_lightningbeam_thickness.integer, 1, 10); M_Options_PrintSlider( " Lightning Scroll", cl_beams_polygons.integer, r_lightningbeam_scroll.integer, 0, 10); @@ -1956,7 +1976,7 @@ static void M_Options_Effects_Key (int k, char ascii) } -#define OPTIONS_GRAPHICS_ITEMS 14 +#define OPTIONS_GRAPHICS_ITEMS 18 static int options_graphics_cursor; @@ -1979,6 +1999,10 @@ extern cvar_t r_bloom_intensity; extern cvar_t r_bloom_power; extern cvar_t r_bloom_blur; extern cvar_t r_bloom_resolution; +extern cvar_t r_hdr; +extern cvar_t r_hdr_bloomintensity; +extern cvar_t r_hdr_scenebrightness; +extern cvar_t r_hdr_glowintensity; extern cvar_t gl_picmip; static void M_Menu_Options_Graphics_AdjustSliders (int dir) @@ -1996,10 +2020,14 @@ static void M_Menu_Options_Graphics_AdjustSliders (int dir) 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_bloom, !r_bloom.integer); - else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_intensity, bound(1, r_bloom_intensity.value + dir * 1, 16)); + else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr, !r_hdr.integer); + else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_bloomintensity, bound(0.125, r_hdr_bloomintensity.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_power, bound(1, r_bloom_power.value + dir * 1, 16)); + else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_intensity, bound(1, r_bloom_intensity.value + dir * 0.25, 16)); 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 (&r_hdr_scenebrightness, bound(0.25, r_hdr_scenebrightness.value + dir * 0.125, 4)); 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"); } @@ -2028,11 +2056,15 @@ static void M_Options_Graphics_Draw (void) 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_PrintCheckbox(" Bloom Effect", true, r_bloom.integer); - M_Options_PrintSlider( " Bloom Intensity", true, r_bloom_intensity.value, 1, 16); - M_Options_PrintSlider( " Bloom Power", true, r_bloom_power.value, 1, 16); - M_Options_PrintSlider( " Bloom Blur", true, r_bloom_blur.value, 1, 16); - M_Options_PrintSlider( " Bloom Resolution", true, r_bloom_resolution.value, 64, 2048); + 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 Bloom Intensity", r_hdr.integer, r_hdr_bloomintensity.value, 0.125, 4); + M_Options_PrintSlider( " HDR Glow Intensity", r_hdr.integer, r_hdr_glowintensity.value, 0, 4); + M_Options_PrintSlider( "Non-HDR Bloom Darkening", !r_hdr.integer && r_bloom.integer, r_bloom_power.value, 1, 16); + M_Options_PrintSlider( " Bloom Intensity", r_hdr.integer || r_bloom.integer, r_bloom_intensity.value, 1, 16); + 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( " Scene Brightness", true, r_hdr_scenebrightness.value, 0.25, 4); M_Options_PrintSlider( " Texture Quality", true, gl_picmip.value, 3, 0); M_Options_PrintCommand( " Restart Renderer", true); } @@ -2080,7 +2112,7 @@ static void M_Options_Graphics_Key (int k, char ascii) static int options_colorcontrol_cursor; // intensity value to match up to 50% dither to 'correct' quake -static cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25", "intensity value that matches up to white/black dither pattern, due to Quake's grey level being quite dark this is 0.25, other games may use other values"}; +static cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.5", "intensity value that matches up to white/black dither pattern, should be 0.5 for linear color"}; void M_Menu_Options_ColorControl_f (void) { @@ -2615,7 +2647,7 @@ static void M_Keys_Draw (void) // LordHavoc: redesigned to print more than 2 keys, inspired by Tomaz's MiniRacer if (keys[0] == -1) - strcpy(keystring, "???"); + strlcpy(keystring, "???", sizeof(keystring)); else { keystring[0] = 0; @@ -2624,8 +2656,8 @@ static void M_Keys_Draw (void) if (keys[j] != -1) { if (j > 0) - strcat(keystring, " or "); - strcat(keystring, Key_KeynumToString (keys[j])); + strlcat(keystring, " or ", sizeof(keystring)); + strlcat(keystring, Key_KeynumToString (keys[j]), sizeof(keystring)); } } } @@ -2721,7 +2753,7 @@ static void M_Reset_Key (int key, char ascii) { case 'Y': case 'y': - Cbuf_AddText ("exec default.cfg\n"); + Cbuf_AddText ("cvar_resettodefaults_all;exec default.cfg\n"); // no break here since we also exit the menu case K_ESCAPE: @@ -3112,6 +3144,12 @@ static int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, cha static int M_ChooseQuitMessage(int request) { + if (m_missingdata) + { + // frag related quit messages are pointless for a fallback menu, so use something generic + if (request-- == 0) return M_QuitMessage("Are you sure you want to quit?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL); + return 0; + } switch (gamemode) { case GAME_NORMAL: @@ -3157,9 +3195,6 @@ static int M_ChooseQuitMessage(int request) if (request-- == 0) return M_QuitMessage("You prefer free beer over free speech?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL); if (request-- == 0) return M_QuitMessage("Is OpenQuartz Propaganda?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL); break; - case GAME_NEXUIZ: //frag related quit messages are pointless for a fallback menu! - if (request-- == 0) return M_QuitMessage("Are you sure you want to quit?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL); - break; default: if (request-- == 0) return M_QuitMessage("Tired of fragging already?",NULL,NULL,NULL,NULL,NULL,NULL,NULL); if (request-- == 0) return M_QuitMessage("Quit now and forfeit your bodycount?",NULL,NULL,NULL,NULL,NULL,NULL,NULL); @@ -3181,7 +3216,7 @@ void M_Menu_Quit_f (void) m_state = m_quit; m_entersound = true; // count how many there are - for (n = 0;M_ChooseQuitMessage(n);n++); + for (n = 1;M_ChooseQuitMessage(n);n++); // choose one M_ChooseQuitMessage(rand() % n); } @@ -3233,8 +3268,8 @@ static void M_Quit_Draw (void) } lines = (lastline - firstline) + 1; M_Background(linelength * 8 + 16, lines * 8 + 16); - if (gamemode != GAME_NEXUIZ) //since this is a fallback menu for Nexuiz (no graphics), it is very hard to read with the box - M_DrawTextBox(0, 0, linelength, lines); //this is less obtrusive than hacking up the M_DrawTextBox function for Nexuiz + if (!m_missingdata) //since this is a fallback menu for missing data, it is very hard to read with the box + M_DrawTextBox(0, 0, linelength, lines); //this is less obtrusive than hacking up the M_DrawTextBox function for (i = 0, l = firstline;i < lines;i++, l++) M_Print(8 + 4 * (linelength - strlen(m_quit_message[l])), 8 + 8 * i, m_quit_message[l]); } @@ -3263,7 +3298,7 @@ void M_Menu_LanConfig_f (void) if (StartingGame) lanConfig_cursor = 1; lanConfig_port = 26000; - sprintf(lanConfig_portname, "%u", lanConfig_port); + sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port); M_Update_Return_Reason(""); } @@ -3429,7 +3464,7 @@ static void M_LanConfig_Key (int key, char ascii) l = atoi(lanConfig_portname); if (l <= 65535) lanConfig_port = l; - sprintf(lanConfig_portname, "%u", lanConfig_port); + sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port); } //============================================================================= @@ -3815,6 +3850,19 @@ static episode_t defeatindetail2episodes[] = {"ATAC Campaign", 0, 3}, }; +static level_t prydonlevels[] = +{ + {"curig2", "Capel Curig"}, // 0 + + {"tdastart", "Gateway"}, // 1 +}; + +static episode_t prydonepisodes[] = +{ + {"Prydon Gate", 0, 1}, + {"The Dark Age", 1, 1} +}; + static gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2}; static gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7}; static gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6}; @@ -3825,6 +3873,7 @@ static gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvs static gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1}; static gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3}; static gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1}; +static gamelevels_t prydongame = {"Prydon Gate", prydonlevels, prydonepisodes, 2}; typedef struct gameinfo_s { @@ -3845,13 +3894,22 @@ static gameinfo_t gamelist[] = {GAME_BATTLEMECH, &battlemechgame, &battlemechgame}, {GAME_OPENQUARTZ, &openquartzgame, &openquartzgame}, {GAME_DEFEATINDETAIL2, &defeatindetail2game, &defeatindetail2game}, - {(gamemode_t)-1, &sharewarequakegame, ®isteredquakegame} // final fallback + {GAME_PRYDON, &prydongame, &prydongame}, + {GAME_NORMAL, NULL, NULL} // terminator }; static gamelevels_t *lookupgameinfo(void) { - int i; - for (i = 0;gamelist[i].gameid >= 0 && gamelist[i].gameid != gamemode;i++); + 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 @@ -4600,7 +4658,7 @@ void M_Draw (void) break; } - if (gamemode == GAME_TRANSFUSION) { + if (gamemode == GAME_TRANSFUSION && !m_missingdata) { if (m_state != m_credits) { cachepic_t *p, *drop1, *drop2, *drop3; int g, scale_x, scale_y, scale_y_repeat, top_offset;