X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=bfdcce896803bc724d93d4ecf2091c8a11ef8841;hb=b7d4efcb536a746e6bfc9f3a7243d5fa77dfe42e;hp=d1acd800872a717a0936651f7bef4c264717159e;hpb=511c0afa8e95fb7dca7017db29b91ff37b72f4be;p=xonotic%2Fdarkplaces.git diff --git a/menu.c b/menu.c index d1acd800..bfdcce89 100644 --- a/menu.c +++ b/menu.c @@ -18,7 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" +#include "cdaudio.h" #include "image.h" +#include "progsvm.h" #include "mprogdefs.h" @@ -154,8 +156,8 @@ float menu_x, menu_y, menu_width, menu_height; void M_Background(int width, int height) { - menu_width = width; - menu_height = height; + menu_width = bound(1, width, vid.conwidth); + menu_height = bound(1, height, vid.conheight); menu_x = (vid.conwidth - menu_width) * 0.5; menu_y = (vid.conheight - menu_height) * 0.5; //DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0); @@ -330,7 +332,7 @@ void M_Demo_Key (int k, char ascii) break; case K_ENTER: - S_LocalSound ("misc/menu2.wav", true); + S_LocalSound ("sound/misc/menu2.wav"); m_state = m_none; key_dest = key_game; Cbuf_AddText (va ("playdemo %s\n", NehahraDemos[demo_cursor].name)); @@ -338,7 +340,7 @@ void M_Demo_Key (int k, char ascii) case K_UPARROW: case K_LEFTARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); demo_cursor--; if (demo_cursor < 0) demo_cursor = NumberOfNehahraDemos-1; @@ -346,7 +348,7 @@ void M_Demo_Key (int k, char ascii) case K_DOWNARROW: case K_RIGHTARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); demo_cursor++; if (demo_cursor >= NumberOfNehahraDemos) demo_cursor = 0; @@ -432,13 +434,13 @@ void M_Main_Key (int key, char ascii) break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); if (++m_main_cursor >= MAIN_ITEMS) m_main_cursor = 0; break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); if (--m_main_cursor < 0) m_main_cursor = MAIN_ITEMS - 1; break; @@ -613,8 +615,8 @@ void M_SinglePlayer_Draw (void) M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/ttl_sgl.lmp"); - // Transfusion doesn't have a single player mode - if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) + // Some mods don't have a single player mode + if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl.lmp"); @@ -623,10 +625,8 @@ void M_SinglePlayer_Draw (void) M_Print(95, 10 * 8, "Nexuiz is for"); else if (gamemode == GAME_GOODVSBAD2) M_Print(95, 10 * 8, "Good Vs Bad 2 is for"); - else if (gamemode == GAME_BATTLEMECH) + else // if (gamemode == GAME_BATTLEMECH) M_Print(95, 10 * 8, "Battlemech is for"); - else - M_Print(95, 10 * 8, "Transfusion is for"); M_Print(83, 11 * 8, "multiplayer play only"); } else @@ -645,7 +645,7 @@ void M_SinglePlayer_Draw (void) void M_SinglePlayer_Key (int key, char ascii) { - if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) + if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { if (key == K_ESCAPE || key == K_ENTER) m_state = m_main; @@ -659,13 +659,13 @@ void M_SinglePlayer_Key (int key, char ascii) break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); if (++m_singleplayer_cursor >= SINGLEPLAYER_ITEMS) m_singleplayer_cursor = 0; break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); if (--m_singleplayer_cursor < 0) m_singleplayer_cursor = SINGLEPLAYER_ITEMS - 1; break; @@ -684,6 +684,8 @@ void M_SinglePlayer_Key (int key, char ascii) Cbuf_AddText ("coop 0\n"); if (gamemode == GAME_NEHAHRA) Cbuf_AddText ("map nehstart\n"); + else if (gamemode == GAME_TRANSFUSION) + Cbuf_AddText ("map e1m1\n"); else Cbuf_AddText ("map start\n"); break; @@ -807,7 +809,7 @@ void M_Load_Key (int k, char ascii) break; case K_ENTER: - S_LocalSound ("misc/menu2.wav", true); + S_LocalSound ("sound/misc/menu2.wav"); if (!loadable[load_cursor]) return; m_state = m_none; @@ -819,7 +821,7 @@ void M_Load_Key (int k, char ascii) case K_UPARROW: case K_LEFTARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); load_cursor--; if (load_cursor < 0) load_cursor = MAX_SAVEGAMES-1; @@ -827,7 +829,7 @@ void M_Load_Key (int k, char ascii) case K_DOWNARROW: case K_RIGHTARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); load_cursor++; if (load_cursor >= MAX_SAVEGAMES) load_cursor = 0; @@ -852,7 +854,7 @@ void M_Save_Key (int k, char ascii) case K_UPARROW: case K_LEFTARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); load_cursor--; if (load_cursor < 0) load_cursor = MAX_SAVEGAMES-1; @@ -860,7 +862,7 @@ void M_Save_Key (int k, char ascii) case K_DOWNARROW: case K_RIGHTARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); load_cursor++; if (load_cursor >= MAX_SAVEGAMES) load_cursor = 0; @@ -910,13 +912,13 @@ void M_MultiPlayer_Key (int key, char ascii) break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); if (++m_multiplayer_cursor >= MULTIPLAYER_ITEMS) m_multiplayer_cursor = 0; break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); if (--m_multiplayer_cursor < 0) m_multiplayer_cursor = MULTIPLAYER_ITEMS - 1; break; @@ -1081,14 +1083,14 @@ void M_Setup_Key (int k, char ascii) break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); setup_cursor--; if (setup_cursor < 0) setup_cursor = NUM_SETUP_CMDS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); setup_cursor++; if (setup_cursor >= NUM_SETUP_CMDS) setup_cursor = 0; @@ -1097,7 +1099,7 @@ void M_Setup_Key (int k, char ascii) case K_LEFTARROW: if (setup_cursor < 1) return; - S_LocalSound ("misc/menu3.wav", true); + S_LocalSound ("sound/misc/menu3.wav"); if (setup_cursor == 1) setup_top = setup_top - 1; if (setup_cursor == 2) @@ -1114,7 +1116,7 @@ void M_Setup_Key (int k, char ascii) if (setup_cursor < 1) return; forward: - S_LocalSound ("misc/menu3.wav", true); + S_LocalSound ("sound/misc/menu3.wav"); if (setup_cursor == 1) setup_top = setup_top + 1; if (setup_cursor == 2) @@ -1230,7 +1232,7 @@ extern cvar_t r_textshadow; void M_Menu_Options_AdjustSliders (int dir) { int optnum; - S_LocalSound ("misc/menu3.wav", true); + S_LocalSound ("sound/misc/menu3.wav"); optnum = 7; if (options_cursor == optnum++) @@ -1356,7 +1358,7 @@ void M_Options_Draw (void) int visible; cachepic_t *p; - M_Background(320, 240); + M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid.conheight)); M_DrawPic(16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic("gfx/p_option.lmp"); @@ -1364,7 +1366,7 @@ void M_Options_Draw (void) optnum = 0; optcursor = options_cursor; - visible = (vid.conheight - 32) / 8; + visible = (menu_height - 32) / 8; opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8; M_Options_PrintCommand( "Customize controls", true); @@ -1452,14 +1454,14 @@ void M_Options_Key (int k, char ascii) return; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); options_cursor--; if (options_cursor < 0) options_cursor = OPTIONS_ITEMS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); options_cursor++; if (options_cursor >= OPTIONS_ITEMS) options_cursor = 0; @@ -1488,23 +1490,12 @@ void M_Menu_Options_Effects_f (void) extern cvar_t r_detailtextures; -extern cvar_t cl_particles; extern cvar_t cl_stainmaps; -extern cvar_t cl_stainmapsclearonload; -extern cvar_t cl_decals; +extern cvar_t cl_stainmaps_clearonload; extern cvar_t r_explosionclip; extern cvar_t r_modellights; extern cvar_t r_coronas; extern cvar_t gl_flashblend; -extern cvar_t cl_particles_quality; -extern cvar_t cl_particles_bulletimpacts; -extern cvar_t cl_particles_smoke; -extern cvar_t cl_particles_sparks; -extern cvar_t cl_particles_bubbles; -extern cvar_t cl_particles_blood; -extern cvar_t cl_particles_blood_alpha; -extern cvar_t cl_particles_blood_bloodhack; -extern cvar_t cl_particles_explosions_shell; extern cvar_t cl_beams_polygon; extern cvar_t cl_beams_relative; extern cvar_t cl_beams_lightatend; @@ -1519,7 +1510,7 @@ extern cvar_t r_lightningbeam_qmbtexture; void M_Menu_Options_Effects_AdjustSliders (int dir) { int optnum; - S_LocalSound ("misc/menu3.wav", true); + S_LocalSound ("sound/misc/menu3.wav"); optnum = 0; if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8)); @@ -1530,7 +1521,7 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) 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_explosionclip, !r_explosionclip.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer); - else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmapsclearonload, !cl_stainmapsclearonload.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps_clearonload, !cl_stainmaps_clearonload.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_decals, !cl_decals.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer); @@ -1566,7 +1557,7 @@ void M_Options_Effects_Draw (void) int visible; cachepic_t *p; - M_Background(320, 200); + M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid.conheight)); M_DrawPic(16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic("gfx/p_option.lmp"); @@ -1574,7 +1565,7 @@ void M_Options_Effects_Draw (void) optcursor = options_effects_cursor; optnum = 0; - visible = (vid.conheight - 32) / 8; + visible = (menu_height - 32) / 8; opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8; M_Options_PrintSlider( " Lights Per Model", true, r_modellights.value, 0, 8); @@ -1585,7 +1576,7 @@ void M_Options_Effects_Draw (void) M_Options_PrintCheckbox(" Explosion Shell", true, cl_particles_explosions_shell.integer); M_Options_PrintCheckbox(" Explosion Shell Clip", true, r_explosionclip.integer); M_Options_PrintCheckbox(" Stainmaps", true, cl_stainmaps.integer); - M_Options_PrintCheckbox("Onload Clear Stainmaps", true, cl_stainmapsclearonload.integer); + M_Options_PrintCheckbox("Onload Clear Stainmaps", true, cl_stainmaps_clearonload.integer); M_Options_PrintCheckbox(" Decals", true, cl_decals.integer); M_Options_PrintCheckbox(" Detail Texturing", true, r_detailtextures.integer); M_Options_PrintCheckbox(" Bullet Impacts", true, cl_particles_bulletimpacts.integer); @@ -1630,14 +1621,14 @@ void M_Options_Effects_Key (int k, char ascii) break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); options_effects_cursor--; if (options_effects_cursor < 0) options_effects_cursor = OPTIONS_EFFECTS_ITEMS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); options_effects_cursor++; if (options_effects_cursor >= OPTIONS_EFFECTS_ITEMS) options_effects_cursor = 0; @@ -1654,7 +1645,7 @@ void M_Options_Effects_Key (int k, char ascii) } -#define OPTIONS_GRAPHICS_ITEMS 7 +#define OPTIONS_GRAPHICS_ITEMS 12 int options_graphics_cursor; @@ -1672,11 +1663,16 @@ 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; +extern cvar_t r_bloom_intensity; +extern cvar_t r_bloom_power; +extern cvar_t r_bloom_blur; +extern cvar_t r_bloom_resolution; void M_Menu_Options_Graphics_AdjustSliders (int dir) { int optnum; - S_LocalSound ("misc/menu3.wav", true); + S_LocalSound ("sound/misc/menu3.wav"); optnum = 0; @@ -1687,6 +1683,11 @@ void M_Menu_Options_Graphics_AdjustSliders (int dir) 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_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_bloom_power, bound(1, r_bloom_power.value + dir * 1, 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)); } @@ -1695,7 +1696,7 @@ void M_Options_Graphics_Draw (void) int visible; cachepic_t *p; - M_Background(320, 200); + M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid.conheight)); M_DrawPic(16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic("gfx/p_option.lmp"); @@ -1703,7 +1704,7 @@ void M_Options_Graphics_Draw (void) optcursor = options_graphics_cursor; optnum = 0; - visible = (vid.conheight - 32) / 8; + visible = (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); @@ -1713,6 +1714,11 @@ 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); } @@ -1729,14 +1735,14 @@ void M_Options_Graphics_Key (int k, char ascii) break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); options_graphics_cursor--; if (options_graphics_cursor < 0) options_graphics_cursor = OPTIONS_GRAPHICS_ITEMS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); options_graphics_cursor++; if (options_graphics_cursor >= OPTIONS_GRAPHICS_ITEMS) options_graphics_cursor = 0; @@ -1772,7 +1778,7 @@ void M_Menu_Options_ColorControl_AdjustSliders (int dir) { int optnum; float f; - S_LocalSound ("misc/menu3.wav", true); + S_LocalSound ("sound/misc/menu3.wav"); optnum = 1; if (options_colorcontrol_cursor == optnum++) @@ -1881,7 +1887,7 @@ void M_Options_ColorControl_Draw (void) optcursor = options_colorcontrol_cursor; optnum = 0; - visible = (vid.conheight - 32) / 8; + visible = (menu_height - 32) / 8; opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_COLORCONTROL_ITEMS - visible)) * 8; M_Options_PrintCommand( " Reset to defaults", true); @@ -1976,14 +1982,14 @@ void M_Options_ColorControl_Key (int k, char ascii) return; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); options_colorcontrol_cursor--; if (options_colorcontrol_cursor < 0) options_colorcontrol_cursor = OPTIONS_COLORCONTROL_ITEMS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); options_colorcontrol_cursor++; if (options_colorcontrol_cursor >= OPTIONS_COLORCONTROL_ITEMS) options_colorcontrol_cursor = 0; @@ -2322,7 +2328,7 @@ void M_Keys_Key (int k, char ascii) if (bind_grab) { // defining a key - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); if (k == K_ESCAPE) { bind_grab = false; @@ -2345,7 +2351,7 @@ void M_Keys_Key (int k, char ascii) case K_LEFTARROW: case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); do { keys_cursor--; @@ -2357,7 +2363,7 @@ void M_Keys_Key (int k, char ascii) case K_DOWNARROW: case K_RIGHTARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); do { keys_cursor++; @@ -2369,7 +2375,7 @@ void M_Keys_Key (int k, char ascii) case K_ENTER: // go into bind mode M_FindKeysForCommand (bindnames[keys_cursor][0], keys); - S_LocalSound ("misc/menu2.wav", true); + S_LocalSound ("sound/misc/menu2.wav"); if (keys[NUMKEYS - 1] != -1) M_UnbindCommand (bindnames[keys_cursor][0]); bind_grab = true; @@ -2377,7 +2383,7 @@ void M_Keys_Key (int k, char ascii) case K_BACKSPACE: // delete bindings case K_DEL: // delete bindings - S_LocalSound ("misc/menu2.wav", true); + S_LocalSound ("sound/misc/menu2.wav"); M_UnbindCommand (bindnames[keys_cursor][0]); break; } @@ -2505,7 +2511,7 @@ void M_Video_Draw (void) void M_Menu_Video_AdjustSliders (int dir) { - S_LocalSound ("misc/menu3.wav", true); + S_LocalSound ("sound/misc/menu3.wav"); switch (video_cursor) { @@ -2551,7 +2557,7 @@ void M_Video_Key (int key, char ascii) Cvar_SetValueQuick(&vid_height, current_vid_height); Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel); - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); M_Menu_Options_f (); break; @@ -2569,14 +2575,14 @@ void M_Video_Key (int key, char ascii) break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); video_cursor--; if (video_cursor < 0) video_cursor = VIDEO_ITEMS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); video_cursor++; if (video_cursor >= VIDEO_ITEMS) video_cursor = 0; @@ -2880,14 +2886,14 @@ void M_LanConfig_Key (int key, char ascii) break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); lanConfig_cursor--; if (lanConfig_cursor < 0) lanConfig_cursor = NUM_LANCONFIG_CMDS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); lanConfig_cursor++; if (lanConfig_cursor >= NUM_LANCONFIG_CMDS) lanConfig_cursor = 0; @@ -3163,37 +3169,84 @@ episode_t nehahraepisodes[] = // Map list for Transfusion level_t transfusionlevels[] = { - {"bb1", "The Stronghold"}, - {"bb2", "Winter Wonderland"}, - {"bb3", "Bodies"}, - {"bb4", "The Tower"}, - {"bb5", "Click!"}, - {"bb6", "Twin Fortress"}, - {"bb7", "Midgard"}, - {"bb8", "Fun With Heads"}, - {"e1m1", "Cradle to Grave"}, {"e1m2", "Wrong Side of the Tracks"}, + {"e1m3", "Phantom Express"}, + {"e1m4", "Dark Carnival"}, + {"e1m5", "Hallowed Grounds"}, + {"e1m6", "The Great Temple"}, {"e1m7", "Altar of Stone"}, + {"e1m8", "House of Horrors"}, + + {"e2m1", "Shipwrecked"}, + {"e2m2", "The Lumber Mill"}, + {"e2m3", "Rest for the Wicked"}, + {"e2m4", "The Overlooked Hotel"}, + {"e2m5", "The Haunting"}, + {"e2m6", "The Cold Rush"}, + {"e2m7", "Bowels of the Earth"}, {"e2m8", "The Lair of Shial"}, + {"e2m9", "Thin Ice"}, + {"e3m1", "Ghost Town"}, + {"e3m2", "The Siege"}, + {"e3m3", "Raw Sewage"}, + {"e3m4", "The Sick Ward"}, + {"e3m5", "Spare Parts"}, + {"e3m6", "Monster Bait"}, {"e3m7", "The Pit of Cerberus"}, + {"e3m8", "Catacombs"}, + {"e4m1", "Butchery Loves Company"}, + {"e4m2", "Breeding Grounds"}, + {"e4m3", "Charnel House"}, + {"e4m4", "Crystal Lake"}, + {"e4m5", "Fire and Brimstone"}, + {"e4m6", "The Ganglion Depths"}, {"e4m7", "In the Flesh"}, {"e4m8", "The Hall of the Epiphany"}, {"e4m9", "Mall of the Dead"}, + {"bb1", "The Stronghold"}, + {"bb2", "Winter Wonderland"}, + {"bb3", "Bodies"}, + {"bb4", "The Tower"}, + {"bb5", "Click!"}, + {"bb6", "Twin Fortress"}, + {"bb7", "Midgard"}, + {"bb8", "Fun With Heads"}, {"dm1", "Monolith Building 11"}, {"dm2", "Power!"}, {"dm3", "Area 15"}, + {"e6m1", "Welcome to Your Life"}, + {"e6m2", "They Are Here"}, + {"e6m3", "Public Storage"}, + {"e6m4", "Aqueducts"}, + {"e6m5", "The Ruined Temple"}, + {"e6m6", "Forbidden Rituals"}, + {"e6m7", "The Dungeon"}, {"e6m8", "Beauty and the Beast"}, {"e6m9", "Forgotten Catacombs"}, + {"cp01", "Boat Docks"}, + {"cp02", "Old Opera House"}, + {"cp03", "Gothic Library"}, + {"cp04", "Lost Monastery"}, + {"cp05", "Steamboat"}, + {"cp06", "Graveyard"}, + {"cp07", "Mountain Pass"}, + {"cp08", "Abysmal Mine"}, + {"cp09", "Castle"}, + {"cps1", "Boggy Creek"}, + {"cpbb01", "Crypt of Despair"}, + {"cpbb02", "Pits of Blood"}, {"cpbb03", "Unholy Cathedral"}, + {"cpbb04", "Deadly Inspirations"}, {"b2a15", "Area 15 (B2)"}, + {"b2power", "BB_Power"}, {"barena", "Blood Arena"}, {"bkeep", "Blood Keep"}, {"bstar", "Brown Star"}, @@ -3219,13 +3272,17 @@ level_t transfusionlevels[] = episode_t transfusionepisodes[] = { - {"Blood", 0, 8}, - {"Blood Single Player", 8, 10}, - {"Plasma Pack", 18, 6}, - {"Cryptic Passage", 24, 2}, - {"Blood 2", 26, 5}, - {"Transfusion", 31, 9}, - {"Conversions", 40, 6} + {"The Way of All Flesh", 0, 8}, + {"Even Death May Die", 8, 9}, + {"Farewell to Arms", 17, 8}, + {"Dead Reckoning", 25, 9}, + {"BloodBath", 34, 11}, + {"Post Mortem", 45, 9}, + {"Cryptic Passage", 54, 10}, + {"Cryptic BloodBath", 64, 4}, + {"Blood 2", 68, 6}, + {"Transfusion", 74, 9}, + {"Conversions", 83, 6} }; level_t goodvsbad2levels[] = @@ -3293,7 +3350,7 @@ gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7}; gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6}; gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4}; gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4}; -gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 7}; +gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 11}; gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1}; gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1}; gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3}; @@ -3374,9 +3431,11 @@ void M_GameOptions_Draw (void) M_Print(0, 64, " Game Type"); if (gamemode == GAME_TRANSFUSION) { - if (!deathmatch.integer) + if (!coop.integer && !deathmatch.integer) Cvar_SetValue("deathmatch", 1); - if (deathmatch.integer == 2) + if (deathmatch.integer == 0) + M_Print(160, 64, "Cooperative"); + else if (deathmatch.integer == 2) M_Print(160, 64, "Capture the Flag"); else M_Print(160, 64, "Blood Bath"); @@ -3523,10 +3582,26 @@ void M_NetStart_Change (int dir) break; if (gamemode == GAME_TRANSFUSION) { - if (deathmatch.integer == 2) // changing from CTF to BloodBath - Cvar_SetValueQuick (&deathmatch, 0); - else // changing from BloodBath to CTF - Cvar_SetValueQuick (&deathmatch, 2); + switch (deathmatch.integer) + { + // From Cooperative to BloodBath + case 0: + Cvar_SetValueQuick (&coop, 0); + Cvar_SetValueQuick (&deathmatch, 1); + break; + + // From BloodBath to CTF + case 1: + Cvar_SetValueQuick (&coop, 0); + Cvar_SetValueQuick (&deathmatch, 2); + break; + + // From CTF to Cooperative + //case 2: + default: + Cvar_SetValueQuick (&coop, 1); + Cvar_SetValueQuick (&deathmatch, 0); + } } else if (gamemode == GAME_BATTLEMECH) { @@ -3651,14 +3726,14 @@ void M_GameOptions_Key (int key, char ascii) break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); gameoptions_cursor--; if (gameoptions_cursor < 0) gameoptions_cursor = NUM_GAMEOPTIONS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); gameoptions_cursor++; if (gameoptions_cursor >= NUM_GAMEOPTIONS) gameoptions_cursor = 0; @@ -3667,19 +3742,19 @@ void M_GameOptions_Key (int key, char ascii) case K_LEFTARROW: if (gameoptions_cursor == 0) break; - S_LocalSound ("misc/menu3.wav", true); + S_LocalSound ("sound/misc/menu3.wav"); M_NetStart_Change (-1); break; case K_RIGHTARROW: if (gameoptions_cursor == 0) break; - S_LocalSound ("misc/menu3.wav", true); + S_LocalSound ("sound/misc/menu3.wav"); M_NetStart_Change (1); break; case K_ENTER: - S_LocalSound ("misc/menu2.wav", true); + S_LocalSound ("sound/misc/menu2.wav"); if (gameoptions_cursor == 0) { if (sv.active) @@ -3753,11 +3828,11 @@ void M_ServerList_Draw (void) s = va("%i/%i masters %i/%i servers", masterreplycount, masterquerycount, serverreplycount, serverquerycount); M_PrintRed((640 - strlen(s) * 8) / 2, 32, s); if (*m_return_reason) - M_Print(16, vid.conheight - 8, m_return_reason); + M_Print(16, menu_height - 8, m_return_reason); y = 48; - visible = (vid.conheight - 16 - y) / 8; - start = bound(0, slist_cursor - (visible >> 1), hostCacheCount - visible); - end = min(start + visible, hostCacheCount); + visible = (menu_height - 16 - y) / 8; + start = bound(0, slist_cursor - (visible >> 1), hostcache_viewcount - visible); + end = min(start + visible, hostcache_viewcount); p = Draw_CachePic("gfx/p_multi.lmp"); M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi.lmp"); @@ -3766,8 +3841,8 @@ void M_ServerList_Draw (void) for (n = start;n < end;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_Print(0, y, hostcache[n].line1);y += 8; - M_Print(0, y, hostcache[n].line2);y += 8; + M_Print(0, y, hostcache_viewset[n]->line1);y += 8; + M_Print(0, y, hostcache_viewset[n]->line2);y += 8; } } else if (realtime - masterquerytime < 3) @@ -3794,23 +3869,23 @@ void M_ServerList_Key(int k, char ascii) case K_UPARROW: case K_LEFTARROW: - S_LocalSound("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); slist_cursor--; if (slist_cursor < 0) - slist_cursor = hostCacheCount - 1; + slist_cursor = hostcache_viewcount - 1; break; case K_DOWNARROW: case K_RIGHTARROW: - S_LocalSound("misc/menu1.wav", true); + S_LocalSound ("sound/misc/menu1.wav"); slist_cursor++; - if (slist_cursor >= hostCacheCount) + if (slist_cursor >= hostcache_viewcount) slist_cursor = 0; break; case K_ENTER: - S_LocalSound("misc/menu2.wav", true); - Cbuf_AddText(va("connect \"%s\"\n", hostcache[slist_cursor].cname)); + S_LocalSound ("sound/misc/menu2.wav"); + Cbuf_AddText(va("connect \"%s\"\n", hostcache_viewset[slist_cursor]->info.cname)); break; default: @@ -4001,7 +4076,7 @@ void M_Draw (void) if (m_entersound) { - S_LocalSound ("misc/menu2.wav", true); + S_LocalSound ("sound/misc/menu2.wav"); m_entersound = false; } @@ -4112,9 +4187,6 @@ mfunction_t *PRVM_ED_FindFunction(const char *); #define M_F_INIT "m_init" #define M_F_KEYDOWN "m_keydown" #define M_F_DRAW "m_draw" -// ng_menu function names -#define M_F_DISPLAY "m_display" -#define M_F_HIDE "m_hide" // normal menu names (rest) #define M_F_TOGGLE "m_toggle" #define M_F_SHUTDOWN "m_shutdown" @@ -4123,12 +4195,7 @@ static char *m_required_func[] = { M_F_INIT, M_F_KEYDOWN, M_F_DRAW, -#ifdef NG_MENU -M_F_DISPLAY, -M_F_HIDE, -#else M_F_TOGGLE, -#endif M_F_SHUTDOWN, }; @@ -4268,7 +4335,6 @@ void MP_Init (void) void MP_Restart(void) { - MP_Init(); }