X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=466e9f1f070dc840d578d5b863fa0519fdc8132b;hp=f4f66b27d60ac53febe9179c9f15dbd7f1a31052;hb=176d5da4901d68110dc57a94110690efad41b512;hpb=5e50ce0968fe5404bc5872337ed882f2505dcc9c diff --git a/menu.c b/menu.c index f4f66b27..466e9f1f 100644 --- a/menu.c +++ b/menu.c @@ -28,14 +28,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define TYPE_GAME 2 #define TYPE_BOTH 3 -mempool_t *menu_mempool; - int NehGameType; 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 +48,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 +56,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 +70,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 +78,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 +92,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,12 +163,12 @@ float menu_x, menu_y, menu_width, menu_height; void M_Background(int width, int 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; + menu_width = bound(1, width, vid_conwidth.integer); + menu_height = bound(1, height, vid_conheight.integer); + menu_x = (vid_conwidth.integer - menu_width) * 0.5; + menu_y = (vid_conheight.integer - menu_height) * 0.5; //DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0); - DrawQ_Fill(0, 0, vid.conwidth, vid.conheight, 0, 0, 0, 0.5, 0); + DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0); } /* @@ -376,6 +383,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,10 +410,31 @@ 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", false); + 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"); + p = Draw_CachePic ("gfx/ttl_main.lmp", false); M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main.lmp"); // Nehahra if (gamemode == GAME_NEHAHRA) @@ -563,6 +597,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) @@ -613,7 +719,7 @@ void M_SinglePlayer_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic ("gfx/ttl_sgl.lmp"); + p = Draw_CachePic ("gfx/ttl_sgl.lmp", false); // Some mods don't have a single player mode if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) @@ -682,12 +788,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: @@ -724,7 +831,7 @@ void M_ScanSaves (void) strcpy (m_filenames[i], "--- UNUSED SLOT ---"); loadable[i] = false; sprintf (name, "s%i.sav", i); - f = FS_Open (name, "rb", false); + f = FS_Open (name, "rb", false, false); if (!f) continue; // read enough to get the comment @@ -778,8 +885,8 @@ void M_Load_Draw (void) M_Background(320, 200); - p = Draw_CachePic ("gfx/p_load.lmp"); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp"); + p = Draw_CachePic ("gfx/p_load.lmp", false); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp" ); for (i=0 ; i< MAX_SAVEGAMES; i++) M_Print(16, 32 + 8*i, m_filenames[i]); @@ -796,7 +903,7 @@ void M_Save_Draw (void) M_Background(320, 200); - p = Draw_CachePic ("gfx/p_save.lmp"); + p = Draw_CachePic ("gfx/p_save.lmp", false); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp"); for (i=0 ; iwidth/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", false); + 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 1\n"); + break; + case 1: + Cbuf_AddText ("skill 2\n"); + break; + case 2: + Cbuf_AddText ("skill 3\n"); + break; + case 3: + Cbuf_AddText ("skill 4\n"); + break; + case 4: + Cbuf_AddText ("skill 5\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 */ @@ -897,10 +1167,20 @@ void M_MultiPlayer_Draw (void) int f; cachepic_t *p; + if (gamemode == GAME_TRANSFUSION) + { + M_Background(640, 480); + p = Draw_CachePic ("gfx/tb-online", false); + 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"); - p = Draw_CachePic ("gfx/p_multi.lmp"); + p = Draw_CachePic ("gfx/p_multi.lmp", false); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); M_DrawPic (72, 32, "gfx/mp_menu.lmp"); @@ -1018,7 +1298,7 @@ void M_Setup_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic ("gfx/p_multi.lmp"); + p = Draw_CachePic ("gfx/p_multi.lmp", false); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); M_Print(64, 40, "Your name"); @@ -1046,12 +1326,12 @@ void M_Setup_Draw (void) menuplyr_bottom = -1; if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true))) { - data = LoadLMPAs8Bit (f, 0, 0); + data = LoadLMP (f, 0, 0, true); menuplyr_width = image_width; menuplyr_height = image_height; Mem_Free(f); - menuplyr_pixels = Mem_Alloc(menu_mempool, menuplyr_width * menuplyr_height); - menuplyr_translated = Mem_Alloc(menu_mempool, menuplyr_width * menuplyr_height * 4); + menuplyr_pixels = Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height); + menuplyr_translated = Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height * 4); memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height); Mem_Free(data); } @@ -1365,10 +1645,10 @@ void M_Options_Draw (void) int visible; cachepic_t *p; - M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid.conheight)); + M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer)); M_DrawPic(16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic("gfx/p_option.lmp"); + p = Draw_CachePic("gfx/p_option.lmp", false); M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); optnum = 0; @@ -1564,10 +1844,10 @@ void M_Options_Effects_Draw (void) int visible; cachepic_t *p; - M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid.conheight)); + M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer)); M_DrawPic(16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic("gfx/p_option.lmp"); + p = Draw_CachePic("gfx/p_option.lmp", false); M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); optcursor = options_effects_cursor; @@ -1703,10 +1983,10 @@ void M_Options_Graphics_Draw (void) int visible; cachepic_t *p; - M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid.conheight)); + M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer)); M_DrawPic(16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic("gfx/p_option.lmp"); + p = Draw_CachePic("gfx/p_option.lmp", false); M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); optcursor = options_graphics_cursor; @@ -1889,7 +2169,7 @@ void M_Options_ColorControl_Draw (void) M_Background(320, 256); M_DrawPic(16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic("gfx/p_option.lmp"); + p = Draw_CachePic("gfx/p_option.lmp", false); M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); optcursor = options_colorcontrol_cursor; @@ -1918,8 +2198,8 @@ void M_Options_ColorControl_Draw (void) 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.realwidth / vid.conwidth; - t = (float) 4 / 2 * vid.realheight / vid.conheight; + 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, "gfx/colorcontrol/ditherpattern.tga", 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; DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,0,0,1, 0,1, 0,0,0,1, 1,1, 1,0,0,1, 0);opty += 4; DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 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);opty += 4; @@ -1930,8 +2210,8 @@ void M_Options_ColorControl_Draw (void) DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,1,1,1, 0,1, 0,0,0,1, 1,1, 1,1,1,1, 0);opty += 4; c = menu_options_colorcontrol_correctionvalue.value; // intensity value that should be matched up to a 50% dither to 'correct' quake - s = (float) 48 / 2 * vid.realwidth / vid.conwidth; - t = (float) 48 / 2 * vid.realheight / vid.conheight; + s = (float) 48 / 2 * vid.width / vid_conwidth.integer; + t = (float) 48 / 2 * vid.height / vid_conheight.integer; u = s * 0.5; v = t * 0.5; opty += 8; @@ -2226,7 +2506,7 @@ void M_Menu_Keys_f (void) #define NUMKEYS 5 -void M_FindKeysForCommand (char *command, int *keys) +void M_FindKeysForCommand (const char *command, int *keys) { int count; int j; @@ -2277,7 +2557,7 @@ void M_Keys_Draw (void) M_Background(320, 48 + 8 * numcommands); - p = Draw_CachePic ("gfx/ttl_cstm.lmp"); + p = Draw_CachePic ("gfx/ttl_cstm.lmp", false); M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp"); if (bind_grab) @@ -2408,6 +2688,11 @@ void M_Reset_Key (int key, char ascii) { switch (key) { + case 'Y': + case 'y': + Cbuf_AddText ("exec default.cfg\n"); + // no break here since we also exit the menu + case K_ESCAPE: case 'n': case 'N': @@ -2415,11 +2700,6 @@ void M_Reset_Key (int key, char ascii) m_entersound = true; break; - case 'Y': - case 'y': - Cbuf_AddText ("exec default.cfg\n"); - break; - default: break; } @@ -2440,7 +2720,7 @@ void M_Reset_Draw (void) #define VIDEO_ITEMS 5 int video_cursor = 0; -int video_cursor_table[] = {56, 68, 80, 100, 120}; +int video_cursor_table[] = {56, 68, 80, 100, 130}; // note: if modes are added to the beginning of this list, update the // video_resolution = x; in M_Menu_Video_f below unsigned short video_resolutions[][2] = {{320,240}, {400,300}, {512,384}, {640,480}, {800,600}, {1024,768}, {1152,864}, {1280,960}, {1280,1024}, {1600,1200}, {1792,1344}, {1920,1440}, {2048,1536}, {0,0}}; @@ -2449,11 +2729,6 @@ unsigned short video_resolutions[][2] = {{320,240}, {400,300}, {512,384}, {640,4 #define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1) int video_resolution; -extern int current_vid_fullscreen; -extern int current_vid_width; -extern int current_vid_height; -extern int current_vid_bitsperpixel; - void M_Menu_Video_f (void) { @@ -2464,8 +2739,8 @@ void M_Menu_Video_f (void) // Look for the current resolution for (video_resolution = 0; video_resolution < VID_RES_COUNT; video_resolution++) { - if (video_resolutions[video_resolution][0] == current_vid_width && - video_resolutions[video_resolution][1] == current_vid_height) + if (video_resolutions[video_resolution][0] == vid.width && + video_resolutions[video_resolution][1] == vid.height) break; } @@ -2488,7 +2763,7 @@ void M_Video_Draw (void) M_Background(320, 200); M_DrawPic(16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic("gfx/vidmodes.lmp"); + p = Draw_CachePic("gfx/vidmodes.lmp", false); M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes.lmp"); // Resolution @@ -2559,10 +2834,10 @@ void M_Video_Key (int key, char ascii) { case K_ESCAPE: // vid_shared.c has a copy of the current video config. We restore it - Cvar_SetValueQuick(&vid_fullscreen, current_vid_fullscreen); - Cvar_SetValueQuick(&vid_width, current_vid_width); - Cvar_SetValueQuick(&vid_height, current_vid_height); - Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel); + Cvar_SetValueQuick(&vid_fullscreen, vid.fullscreen); + Cvar_SetValueQuick(&vid_width, vid.width); + Cvar_SetValueQuick(&vid_height, vid.height); + Cvar_SetValueQuick(&vid_bitsperpixel, vid.bitsperpixel); S_LocalSound ("sound/misc/menu1.wav"); M_Menu_Options_f (); @@ -2654,6 +2929,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 */ @@ -2840,7 +3142,7 @@ void M_LanConfig_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic ("gfx/p_multi.lmp"); + p = Draw_CachePic ("gfx/p_multi.lmp", false); basex = (320-p->width)/2; M_DrawPic (basex, 4, "gfx/p_multi.lmp"); @@ -3253,6 +3555,8 @@ level_t transfusionlevels[] = {"cpbb04", "Deadly Inspirations"}, {"b2a15", "Area 15 (B2)"}, + {"b2bodies", "BB_Bodies (B2)"}, + {"b2cabana", "BB_Cabana"}, {"b2power", "BB_Power"}, {"barena", "Blood Arena"}, {"bkeep", "Blood Keep"}, @@ -3273,7 +3577,10 @@ level_t transfusionlevels[] = {"fragm", "Frag'M"}, {"maim", "Maim"}, {"qe1m7", "The House of Chthon"}, - {"qmorbias", "Dm-Morbias"}, + {"qdm1", "Place of Two Deaths"}, + {"qdm4", "The Bad Place"}, + {"qdm5", "The Cistern"}, + {"qmorbias", "DM-Morbias"}, {"simple", "Dead Simple"} }; @@ -3287,9 +3594,9 @@ episode_t transfusionepisodes[] = {"Post Mortem", 45, 9}, {"Cryptic Passage", 54, 10}, {"Cryptic BloodBath", 64, 4}, - {"Blood 2", 68, 6}, - {"Transfusion", 74, 9}, - {"Conversions", 83, 6} + {"Blood 2", 68, 8}, + {"Transfusion", 76, 9}, + {"Conversions", 85, 9} }; level_t goodvsbad2levels[] = @@ -3424,7 +3731,7 @@ void M_GameOptions_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque.lmp"); - p = Draw_CachePic ("gfx/p_multi.lmp"); + p = Draw_CachePic ("gfx/p_multi.lmp", false); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); M_DrawTextBox (152, 32, 10, 1); @@ -3495,17 +3802,31 @@ void M_GameOptions_Draw (void) } M_Print(160, 72, msg); } - M_Print(0, 80, " Skill"); - if (skill.integer == 0) - M_Print(160, 80, "Easy difficulty"); - else if (skill.integer == 1) - M_Print(160, 80, "Normal difficulty"); - else if (skill.integer == 2) - M_Print(160, 80, "Hard difficulty"); + if (gamemode == GAME_TRANSFUSION) + { + if (skill.integer == 1) + M_Print(160, 80, "Still Kicking"); + else if (skill.integer == 2) + M_Print(160, 80, "Pink On The Inside"); + else if (skill.integer == 3) + M_Print(160, 80, "Lightly Broiled"); + else if (skill.integer == 4) + M_Print(160, 80, "Well Done"); + else + M_Print(160, 80, "Extra Crispy"); + } else - M_Print(160, 80, "Nightmare difficulty"); - + { + if (skill.integer == 0) + M_Print(160, 80, "Easy difficulty"); + else if (skill.integer == 1) + M_Print(160, 80, "Normal difficulty"); + else if (skill.integer == 2) + M_Print(160, 80, "Hard difficulty"); + else + M_Print(160, 80, "Nightmare difficulty"); + } M_Print(0, 88, " Frag Limit"); if (fraglimit.integer == 0) M_Print(160, 88, "none"); @@ -3651,10 +3972,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 > 5) + Cvar_SetValueQuick (&skill, 1); + if (skill.integer < 1) + Cvar_SetValueQuick (&skill, 5); + } + else + { + if (skill.integer > 3) + Cvar_SetValueQuick (&skill, 0); + if (skill.integer < 0) + Cvar_SetValueQuick (&skill, 3); + } break; case 5: @@ -3830,7 +4161,10 @@ 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.integer - 80); + 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); M_PrintRed((640 - strlen(s) * 8) / 2, 32, s); @@ -3838,18 +4172,18 @@ void M_ServerList_Draw (void) M_Print(16, menu_height - 8, m_return_reason); y = 48; visible = (menu_height - 16 - y) / 8 / 2; - start = bound(0, slist_cursor - (visible >> 1), hostcache_viewcount - visible); - end = min(start + visible, hostcache_viewcount); + start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible); + end = min(start + visible, serverlist_viewcount); - p = Draw_CachePic("gfx/p_multi.lmp"); + p = Draw_CachePic("gfx/p_multi.lmp", false); M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi.lmp"); if (end > start) { 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_viewset[n]->line1);y += 8; - M_Print(0, y, hostcache_viewset[n]->line2);y += 8; + M_Print(0, y, serverlist_viewlist[n]->line1);y += 8; + M_Print(0, y, serverlist_viewlist[n]->line2);y += 8; } } else if (realtime - masterquerytime < 3) @@ -3879,20 +4213,21 @@ void M_ServerList_Key(int k, char ascii) S_LocalSound ("sound/misc/menu1.wav"); slist_cursor--; if (slist_cursor < 0) - slist_cursor = hostcache_viewcount - 1; + slist_cursor = serverlist_viewcount - 1; break; case K_DOWNARROW: case K_RIGHTARROW: S_LocalSound ("sound/misc/menu1.wav"); slist_cursor++; - if (slist_cursor >= hostcache_viewcount) + if (slist_cursor >= serverlist_viewcount) slist_cursor = 0; break; case K_ENTER: S_LocalSound ("sound/misc/menu2.wav"); - Cbuf_AddText(va("connect \"%s\"\n", hostcache_viewset[slist_cursor]->info.cname)); + if (serverlist_viewcount) + Cbuf_AddText(va("connect \"%s\"\n", serverlist_viewlist[slist_cursor]->info.cname)); break; default: @@ -3911,7 +4246,6 @@ void M_Shutdown(void); void M_Init (void) { - menu_mempool = Mem_AllocPool("Menu", 0, NULL); menuplyr_load = true; menuplyr_pixels = NULL; @@ -3925,12 +4259,14 @@ void M_Init (void) Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f); Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f); Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f); - Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue); Cmd_AddCommand ("menu_keys", M_Menu_Keys_f); Cmd_AddCommand ("menu_video", M_Menu_Video_f); 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) { @@ -4016,6 +4352,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; @@ -4064,6 +4408,10 @@ void M_Draw (void) M_Help_Draw (); break; + case m_credits: + M_Credits_Draw (); + break; + case m_quit: M_Quit_Draw (); break; @@ -4081,6 +4429,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.integer * 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), false); + 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, "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"); @@ -4110,6 +4487,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; @@ -4159,6 +4544,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; @@ -4181,8 +4570,6 @@ void M_Shutdown(void) { // reset key_dest key_dest = key_game; - - Mem_FreePool (&menu_mempool); } void M_Restart(void) @@ -4242,8 +4629,8 @@ void MP_Keydown (int key, char ascii) *prog->time = realtime; // pass key - prog->globals[OFS_PARM0] = (float) key; - prog->globals[OFS_PARM1] = (float) ascii; + prog->globals.generic[OFS_PARM0] = (float) key; + prog->globals.generic[OFS_PARM1] = (float) ascii; PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key, float ascii) required\n"); PRVM_End; @@ -4307,9 +4694,10 @@ void MP_Init (void) PRVM_Begin; PRVM_InitProg(PRVM_MENUPROG); - prog->crc = M_PROGHEADER_CRC; + prog->headercrc = M_PROGHEADER_CRC; prog->edictprivate_size = 0; // no private struct used prog->name = M_NAME; + prog->num_edicts = 1; prog->limit_edicts = M_MAX_EDICTS; prog->extensionstring = vm_m_extensions; prog->builtins = vm_m_builtins; @@ -4319,11 +4707,9 @@ void MP_Init (void) prog->error_cmd = MP_Error; // allocate the mempools - prog->edicts_mempool = Mem_AllocPool(M_NAME " edicts mempool", 0, NULL); - prog->edictstring_mempool = Mem_AllocPool( M_NAME " edict string mempool", 0, NULL); prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL); - PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func); + PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, 0, NULL); // set m_draw and m_keydown m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions); @@ -4400,6 +4786,7 @@ void MR_Restart(void) void Call_MR_ToggleMenu_f(void) { + Host_StartVideo(); if(MR_ToggleMenu_f) MR_ToggleMenu_f(); } @@ -4408,6 +4795,7 @@ 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_Error); //Force to old-style menu Cmd_AddCommand ("menu_restart",MR_Restart);