X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=23596ac14bda56d463ba90ce605155814b3448fa;hb=5728a70049f5d05ed6bcb6f95d96233efaff6ac5;hp=081c12996230effc866e897727a3c59674c5d0e9;hpb=5ab33ac35e712417cbc151d01abc808c2de3e435;p=xonotic%2Fdarkplaces.git diff --git a/menu.c b/menu.c index 081c1299..23596ac1 100644 --- a/menu.c +++ b/menu.c @@ -36,6 +36,8 @@ enum m_state_e m_state; void M_Menu_Main_f (void); void M_Menu_SinglePlayer_f (void); + void M_Menu_Transfusion_Episode_f (void); + void M_Menu_Transfusion_Skill_f (void); void M_Menu_Load_f (void); void M_Menu_Save_f (void); void M_Menu_MultiPlayer_f (void); @@ -48,6 +50,7 @@ void M_Menu_Main_f (void); void M_Menu_Reset_f (void); void M_Menu_Video_f (void); void M_Menu_Help_f (void); + void M_Menu_Credits_f (void); void M_Menu_Quit_f (void); void M_Menu_LanConfig_f (void); void M_Menu_GameOptions_f (void); @@ -55,6 +58,8 @@ void M_Menu_ServerList_f (void); void M_Main_Draw (void); void M_SinglePlayer_Draw (void); + void M_Transfusion_Episode_Draw (void); + void M_Transfusion_Skill_Draw (void); void M_Load_Draw (void); void M_Save_Draw (void); void M_MultiPlayer_Draw (void); @@ -67,6 +72,7 @@ void M_Main_Draw (void); void M_Reset_Draw (void); void M_Video_Draw (void); void M_Help_Draw (void); + void M_Credits_Draw (void); void M_Quit_Draw (void); void M_LanConfig_Draw (void); void M_GameOptions_Draw (void); @@ -74,6 +80,8 @@ void M_ServerList_Draw (void); void M_Main_Key (int key, char ascii); void M_SinglePlayer_Key (int key, char ascii); + void M_Transfusion_Episode_Key (int key, char ascii); + void M_Transfusion_Skill_Key (int key, char ascii); void M_Load_Key (int key, char ascii); void M_Save_Key (int key, char ascii); void M_MultiPlayer_Key (int key, char ascii); @@ -86,6 +94,7 @@ void M_Main_Key (int key, char ascii); void M_Reset_Key (int key, char ascii); void M_Video_Key (int key, char ascii); void M_Help_Key (int key, char ascii); + void M_Credits_Key (int key, char ascii); void M_Quit_Key (int key, char ascii); void M_LanConfig_Key (int key, char ascii); void M_GameOptions_Key (int key, char ascii); @@ -156,8 +165,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); @@ -376,6 +385,12 @@ void M_Menu_Main_f (void) } else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item MAIN_ITEMS = 6; + else if (gamemode == GAME_TRANSFUSION) { + if (sv.active && !cl.intermission && cl.islocalgame) + MAIN_ITEMS = 8; + else + MAIN_ITEMS = 7; + } else MAIN_ITEMS = 5; @@ -397,8 +412,29 @@ void M_Main_Draw (void) int f; cachepic_t *p; - M_Background(320, 200); + if (gamemode == GAME_TRANSFUSION) { + int y1, y2, y3; + M_Background(640, 480); + p = Draw_CachePic ("gfx/tb-transfusion"); + M_DrawPic (640/2 - p->width/2, 40, "gfx/tb-transfusion"); + y2 = 120; + // 8 rather than MAIN_ITEMS to skip a number and not miss the last option + for (y1 = 1; y1 <= 8; y1++) + { + if (MAIN_ITEMS == 7 && y1 == 4) + y1++; + M_DrawPic (0, y2, va("gfx/mainmenu%i", y1)); + y2 += 40; + } + if (MAIN_ITEMS == 7 && m_main_cursor > 2) + y3 = m_main_cursor + 2; + else + y3 = m_main_cursor + 1; + M_DrawPic (0, 120 + m_main_cursor * 40, va("gfx/mainmenu%iselected", y3)); + return; + } + M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/ttl_main.lmp"); M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main.lmp"); @@ -563,6 +599,78 @@ void M_Main_Key (int key, char ascii) break; } } + else if (gamemode == GAME_TRANSFUSION) { + if (MAIN_ITEMS == 7) + { + switch (m_main_cursor) + { + case 0: + M_Menu_Transfusion_Episode_f (); + break; + + case 1: + M_Menu_MultiPlayer_f (); + break; + + case 2: + M_Menu_Options_f (); + break; + + case 3: + M_Menu_Load_f (); + break; + + case 4: + M_Menu_Help_f (); + break; + + case 5: + M_Menu_Credits_f (); + break; + + case 6: + M_Menu_Quit_f (); + break; + } + } + else + { + switch (m_main_cursor) + { + case 0: + M_Menu_Transfusion_Episode_f (); + break; + + case 1: + M_Menu_MultiPlayer_f (); + break; + + case 2: + M_Menu_Options_f (); + break; + + case 3: + M_Menu_Save_f (); + break; + + case 4: + M_Menu_Load_f (); + break; + + case 5: + M_Menu_Help_f (); + break; + + case 6: + M_Menu_Credits_f (); + break; + + case 7: + M_Menu_Quit_f (); + break; + } + } + } else { switch (m_main_cursor) @@ -682,12 +790,13 @@ void M_SinglePlayer_Key (int key, char ascii) Cbuf_AddText ("maxplayers 1\n"); Cbuf_AddText ("deathmatch 0\n"); 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"); + if (gamemode == GAME_TRANSFUSION) + { + key_dest = key_menu; + M_Menu_Transfusion_Episode_f (); + break; + } + Cbuf_AddText ("startmap_sp\n"); break; case 1: @@ -712,9 +821,10 @@ int loadable[MAX_SAVEGAMES]; void M_ScanSaves (void) { - int i, j; + int i, j, len; char name[MAX_OSPATH]; - char *str; + char buf[SAVEGAME_COMMENT_LENGTH + 256]; + const char *t; qfile_t *f; int version; @@ -723,13 +833,19 @@ void M_ScanSaves (void) strcpy (m_filenames[i], "--- UNUSED SLOT ---"); loadable[i] = false; sprintf (name, "s%i.sav", i); - f = FS_Open (name, "r", false); + f = FS_Open (name, "rb", false); if (!f) continue; - str = FS_Getline (f); - sscanf (str, "%i\n", &version); - str = FS_Getline (f); - strlcpy (m_filenames[i], str, sizeof (m_filenames[i])); + // read enough to get the comment + len = FS_Read(f, buf, sizeof(buf) - 1); + buf[sizeof(buf) - 1] = 0; + t = buf; + // version + COM_ParseToken(&t, false); + version = atoi(com_token); + // description + COM_ParseToken(&t, false); + strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i])); // change _ back to space for (j=0 ; jwidth/2, 40, "gfx/tb-episodes"); + for (y = 0; y < EPISODE_ITEMS; y++){ + M_DrawPic (0, 160 + y * 40, va("gfx/episode%i", y+1)); + } + + M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/episode%iselected", m_episode_cursor + 1)); +} + +void M_Transfusion_Episode_Key (int key, char ascii) +{ + switch (key) + { + case K_ESCAPE: + M_Menu_Main_f (); + break; + + case K_DOWNARROW: + S_LocalSound ("sound/misc/menu1.wav"); + m_episode_cursor++; + if (m_episode_cursor >= EPISODE_ITEMS) + m_episode_cursor = 0; + break; + + case K_UPARROW: + S_LocalSound ("sound/misc/menu1.wav"); + m_episode_cursor--; + if (m_episode_cursor < 0) + m_episode_cursor = EPISODE_ITEMS - 1; + break; + + case K_ENTER: + Cbuf_AddText ("deathmatch 0\n"); + m_entersound = true; + M_Menu_Transfusion_Skill_f (); + } +} + +//============================================================================= +/* Transfusion Single Player Skill Menu */ + +int m_skill_cursor = 2; +#define SKILL_ITEMS 5 + +void M_Menu_Transfusion_Skill_f (void) +{ + m_entersound = true; + m_state = m_transfusion_skill; + key_dest = key_menu; +} + +void M_Transfusion_Skill_Draw (void) +{ + int y; + cachepic_t *p; + M_Background(640, 480); + + p = Draw_CachePic ("gfx/tb-difficulty"); + M_DrawPic(640/2 - p->width/2, 40, "gfx/tb-difficulty"); + + for (y = 0; y < SKILL_ITEMS; y++) + { + M_DrawPic (0, 180 + y * 40, va("gfx/difficulty%i", y+1)); + } + M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va("gfx/difficulty%iselected", m_skill_cursor + 1)); +} + +void M_Transfusion_Skill_Key (int key, char ascii) +{ + switch (key) + { + case K_ESCAPE: + M_Menu_Transfusion_Episode_f (); + break; + + case K_DOWNARROW: + S_LocalSound ("sound/misc/menu1.wav"); + m_skill_cursor++; + if (m_skill_cursor >= SKILL_ITEMS) + m_skill_cursor = 0; + break; + + case K_UPARROW: + S_LocalSound ("sound/misc/menu1.wav"); + m_skill_cursor--; + if (m_skill_cursor < 0) + m_skill_cursor = SKILL_ITEMS - 1; + break; + + case K_ENTER: + m_entersound = true; + switch (m_skill_cursor) + { + case 0: + Cbuf_AddText ("skill 0\n"); + break; + case 1: + Cbuf_AddText ("skill 1\n"); + break; + case 2: + Cbuf_AddText ("skill 2\n"); + break; + case 3: + Cbuf_AddText ("skill 3\n"); + break; + case 4: + Cbuf_AddText ("skill 4\n"); + break; + } + key_dest = key_game; + if (sv.active) + Cbuf_AddText ("disconnect\n"); + Cbuf_AddText ("maxplayers 1\n"); + Cbuf_AddText ("deathmatch 0\n"); + Cbuf_AddText ("coop 0\n"); + switch (m_episode_cursor) + { + case 0: + Cbuf_AddText ("map e1m1\n"); + break; + case 1: + Cbuf_AddText ("map e2m1\n"); + break; + case 2: + Cbuf_AddText ("map e3m1\n"); + break; + case 3: + Cbuf_AddText ("map e4m1\n"); + break; + case 4: + Cbuf_AddText ("map e6m1\n"); + break; + case 5: + Cbuf_AddText ("map cp01\n"); + break; + } + } +} //============================================================================= /* MULTIPLAYER MENU */ @@ -890,6 +1169,16 @@ void M_MultiPlayer_Draw (void) int f; cachepic_t *p; + if (gamemode == GAME_TRANSFUSION) + { + M_Background(640, 480); + p = Draw_CachePic ("gfx/tb-online"); + M_DrawPic (640/2 - p->width/2, 140, "gfx/tb-online"); + for (f = 1; f <= MULTIPLAYER_ITEMS; f++) + M_DrawPic (0, 180 + f*40, va("gfx/online%i", f)); + M_DrawPic (0, 220 + m_multiplayer_cursor * 40, va("gfx/online%iselected", m_multiplayer_cursor + 1)); + return; + } M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque.lmp"); @@ -1358,7 +1647,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"); @@ -1366,7 +1655,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); @@ -1491,7 +1780,7 @@ void M_Menu_Options_Effects_f (void) extern cvar_t r_detailtextures; extern cvar_t cl_stainmaps; -extern cvar_t cl_stainmapsclearonload; +extern cvar_t cl_stainmaps_clearonload; extern cvar_t r_explosionclip; extern cvar_t r_modellights; extern cvar_t r_coronas; @@ -1521,7 +1810,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); @@ -1557,7 +1846,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"); @@ -1565,7 +1854,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); @@ -1576,7 +1865,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); @@ -1645,7 +1934,7 @@ void M_Options_Effects_Key (int k, char ascii) } -#define OPTIONS_GRAPHICS_ITEMS 7 +#define OPTIONS_GRAPHICS_ITEMS 12 int options_graphics_cursor; @@ -1663,12 +1952,17 @@ 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 ("sound/misc/menu3.wav"); - + optnum = 0; if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss, bound(0, r_shadow_gloss.integer + dir, 2)); @@ -1678,6 +1972,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)); } @@ -1686,7 +1985,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"); @@ -1694,7 +1993,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); @@ -1704,6 +2003,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); } @@ -1872,7 +2176,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); @@ -2632,6 +2936,33 @@ void M_Help_Key (int key, char ascii) } +//============================================================================= +/* CEDITS MENU */ + +void M_Menu_Credits_f (void) +{ + key_dest = key_menu; + m_state = m_credits; + m_entersound = true; +} + + + +void M_Credits_Draw (void) +{ + M_Background(640, 480); + DrawQ_Pic (0, 0, "gfx/creditsmiddle", 0, 0, 1, 1, 1, 1, 0); + M_Print (640/2 - 14/2*8, 236, "Coming soon..."); + DrawQ_Pic (0, 0, "gfx/creditstop", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (0, 433, "gfx/creditsbottom", 0, 0, 1, 1, 1, 1, 0); +} + + +void M_Credits_Key (int key, char ascii) +{ + M_Menu_Main_f (); +} + //============================================================================= /* QUIT MENU */ @@ -3231,6 +3562,7 @@ level_t transfusionlevels[] = {"cpbb04", "Deadly Inspirations"}, {"b2a15", "Area 15 (B2)"}, + {"b2power", "BB_Power"}, {"barena", "Blood Arena"}, {"bkeep", "Blood Keep"}, {"bstar", "Brown Star"}, @@ -3264,9 +3596,9 @@ episode_t transfusionepisodes[] = {"Post Mortem", 45, 9}, {"Cryptic Passage", 54, 10}, {"Cryptic BloodBath", 64, 4}, - {"Blood 2", 68, 5}, - {"Transfusion", 73, 9}, - {"Conversions", 82, 6} + {"Blood 2", 68, 6}, + {"Transfusion", 74, 9}, + {"Conversions", 83, 6} }; level_t goodvsbad2levels[] = @@ -3628,10 +3960,20 @@ void M_NetStart_Change (int dir) if (gamemode == GAME_GOODVSBAD2) break; Cvar_SetValueQuick (&skill, skill.integer + dir); - if (skill.integer > 3) - Cvar_SetValueQuick (&skill, 0); - if (skill.integer < 0) - Cvar_SetValueQuick (&skill, 3); + if (gamemode == GAME_TRANSFUSION) + { + if (skill.integer > 4) + Cvar_SetValueQuick (&skill, 0); + if (skill.integer < 0) + Cvar_SetValueQuick (&skill, 4); + } + else + { + if (skill.integer > 3) + Cvar_SetValueQuick (&skill, 0); + if (skill.integer < 0) + Cvar_SetValueQuick (&skill, 3); + } break; case 5: @@ -3807,16 +4149,19 @@ void M_ServerList_Draw (void) const char *s; // use as much vertical space as available - M_Background(640, vid.conheight); + if (gamemode == GAME_TRANSFUSION) + M_Background(640, vid.conheight - 80); + else + M_Background(640, vid.conheight); // scroll the list as the cursor moves 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 / 2; + 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"); @@ -3825,8 +4170,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) @@ -3856,20 +4201,21 @@ void M_ServerList_Key(int k, char ascii) 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 ("sound/misc/menu1.wav"); slist_cursor++; - if (slist_cursor >= hostCacheCount) + if (slist_cursor >= hostcache_viewcount) slist_cursor = 0; break; case K_ENTER: S_LocalSound ("sound/misc/menu2.wav"); - Cbuf_AddText(va("connect \"%s\"\n", hostcache[slist_cursor].cname)); + if (hostcache_viewcount) + Cbuf_AddText(va("connect \"%s\"\n", hostcache_viewset[slist_cursor]->info.cname)); break; default: @@ -3908,6 +4254,9 @@ void M_Init (void) Cmd_AddCommand ("menu_reset", M_Menu_Reset_f); Cmd_AddCommand ("help", M_Menu_Help_f); Cmd_AddCommand ("menu_quit", M_Menu_Quit_f); + Cmd_AddCommand ("menu_transfusion_episode", M_Menu_Transfusion_Episode_f); + Cmd_AddCommand ("menu_transfusion_skill", M_Menu_Transfusion_Skill_f); + Cmd_AddCommand ("menu_credits", M_Menu_Credits_f); if (gamemode == GAME_TRANSFUSION) { @@ -3993,6 +4342,14 @@ void M_Draw (void) M_SinglePlayer_Draw (); break; + case m_transfusion_episode: + M_Transfusion_Episode_Draw (); + break; + + case m_transfusion_skill: + M_Transfusion_Skill_Draw (); + break; + case m_load: M_Load_Draw (); break; @@ -4041,6 +4398,10 @@ void M_Draw (void) M_Help_Draw (); break; + case m_credits: + M_Credits_Draw (); + break; + case m_quit: M_Quit_Draw (); break; @@ -4058,6 +4419,35 @@ void M_Draw (void) break; } + if (gamemode == GAME_TRANSFUSION) { + if (m_state != m_credits) { + cachepic_t *p; + int g, scale_x, scale_y, scale_y_repeat, top_offset; + float scale_y_rate; + scale_y_repeat = vid.conheight * 2; + g = (int)(realtime * 64)%96; + scale_y_rate = (float)(g+1) / 96; + top_offset = (g+12)/12; + p = Draw_CachePic (va("gfx/blooddrip%i", top_offset)); + for (scale_x = 0; scale_x <= vid.conwidth; scale_x += p->width) { + for (scale_y = -scale_y_repeat; scale_y <= vid.conheight; scale_y += scale_y_repeat) { + DrawQ_Pic (scale_x + 21, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 116, scale_y_repeat + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop1", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 180, scale_y_repeat * .275 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 242, scale_y_repeat * .75 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 304, scale_y_repeat * .25 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 362, scale_y_repeat * .46125 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 402, scale_y_repeat * .1725 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 438, scale_y_repeat * .9 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop1", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 484, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 557, scale_y_repeat * .9425 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop1", 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 606, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop2", 0, 0, 1, 1, 1, 1, 0); + } + DrawQ_Pic (scale_x, -1, va("gfx/blooddrip%i", top_offset), 0, 0, 1, 1, 1, 1, 0); + } + } + } + if (m_entersound) { S_LocalSound ("sound/misc/menu2.wav"); @@ -4087,6 +4477,14 @@ void M_Keydown (int key, char ascii) M_SinglePlayer_Key (key, ascii); return; + case m_transfusion_episode: + M_Transfusion_Episode_Key (key, ascii); + return; + + case m_transfusion_skill: + M_Transfusion_Skill_Key (key, ascii); + return; + case m_load: M_Load_Key (key, ascii); return; @@ -4136,6 +4534,10 @@ void M_Keydown (int key, char ascii) M_Help_Key (key, ascii); return; + case m_credits: + M_Credits_Key (key, ascii); + return; + case m_quit: M_Quit_Key (key, ascii); return; @@ -4158,6 +4560,8 @@ void M_Shutdown(void) { // reset key_dest key_dest = key_game; + + Mem_FreePool (&menu_mempool); } void M_Restart(void) @@ -4171,9 +4575,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" @@ -4182,12 +4583,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, }; @@ -4327,7 +4723,6 @@ void MP_Init (void) void MP_Restart(void) { - MP_Init(); } @@ -4409,6 +4804,6 @@ void MR_Init(void) // COMMANDLINEOPTION: Client: -useqmenu causes the first time you open the menu to use the quake menu, then reverts to menu.dat (if forceqmenu is 0) if(COM_CheckParm("-useqmenu")) MR_SetRouting (TRUE); - else + else MR_SetRouting (FALSE); }