X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=b4ee44b8e00d5337cd97930656e5dbaa979d794b;hb=66ae08799675241ffa3cc3bcaa211fddcd63387c;hp=3ab73593a3ae1f8d7a86124ba02466b33a8875b0;hpb=b0671fcac8564a24ec6d499c0a574d71d937ea7d;p=xonotic%2Fdarkplaces.git diff --git a/menu.c b/menu.c index 3ab73593..b4ee44b8 100644 --- a/menu.c +++ b/menu.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -18,13 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" +#include "image.h" -#ifdef _WIN32 -#include "winquake.h" -#endif - -void (*vid_menudrawfn)(void); -void (*vid_menukeyfn)(int key); #define TYPE_DEMO 1 #define TYPE_GAME 2 @@ -42,6 +37,7 @@ void M_Menu_Main_f (void); void M_Menu_Setup_f (void); void M_Menu_Net_f (void); void M_Menu_Options_f (void); + void M_Menu_Options_Effects_f (void); void M_Menu_Keys_f (void); void M_Menu_Video_f (void); void M_Menu_Help_f (void); @@ -49,6 +45,7 @@ void M_Menu_Main_f (void); void M_Menu_LanConfig_f (void); void M_Menu_GameOptions_f (void); void M_Menu_Search_f (void); +void M_Menu_InetSearch_f (void); void M_Menu_ServerList_f (void); void M_Main_Draw (void); @@ -59,6 +56,7 @@ void M_Main_Draw (void); void M_Setup_Draw (void); void M_Net_Draw (void); void M_Options_Draw (void); + void M_Options_Effects_Draw (void); void M_Keys_Draw (void); void M_Video_Draw (void); void M_Help_Draw (void); @@ -66,6 +64,7 @@ void M_Main_Draw (void); void M_LanConfig_Draw (void); void M_GameOptions_Draw (void); void M_Search_Draw (void); +void M_InetSearch_Draw (void); void M_ServerList_Draw (void); void M_Main_Key (int key); @@ -76,6 +75,7 @@ void M_Main_Key (int key); void M_Setup_Key (int key); void M_Net_Key (int key); void M_Options_Key (int key); + void M_Options_Effects_Key (int key); void M_Keys_Key (int key); void M_Video_Key (int key); void M_Help_Key (int key); @@ -83,6 +83,7 @@ void M_Main_Key (int key); void M_LanConfig_Key (int key); void M_GameOptions_Key (int key); void M_Search_Key (int key); +void M_InetSearch_Key (int key); void M_ServerList_Key (int key); qboolean m_entersound; // play after drawing a frame, so caching @@ -171,12 +172,12 @@ void M_DrawCharacter (float cx, float cy, int num) DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0); } -void M_Print (float cx, float cy, char *str) +void M_Print (float cx, float cy, const char *str) { DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0); } -void M_PrintWhite (float cx, float cy, char *str) +void M_PrintWhite (float cx, float cy, const char *str) { DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0); } @@ -272,7 +273,7 @@ void M_DrawTextBox (float x, float y, float width, float height) //============================================================================= -int m_save_demonum; +//int m_save_demonum; /* ================ @@ -294,14 +295,10 @@ void M_ToggleMenu_f (void) m_state = m_none; return; } - if (key_dest == key_console) - { - Con_ToggleConsole_f (); - } - else - { + //if (key_dest == key_console) + // Con_ToggleConsole_f (); + //else M_Menu_Main_f (); - } } @@ -379,11 +376,13 @@ void M_Menu_Main_f (void) else MAIN_ITEMS = 5; + /* if (key_dest != key_menu) { m_save_demonum = cls.demonum; cls.demonum = -1; } + */ key_dest = key_menu; m_state = m_main; m_entersound = true; @@ -424,9 +423,9 @@ void M_Main_Key (int key) case K_ESCAPE: key_dest = key_game; m_state = m_none; - cls.demonum = m_save_demonum; - if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected) - CL_NextDemo (); + //cls.demonum = m_save_demonum; + //if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected) + // CL_NextDemo (); break; case K_DOWNARROW: @@ -581,13 +580,13 @@ void M_SinglePlayer_Draw (void) M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/ttl_sgl.lmp"); - // BloodBath doesn't have a single player mode - if (gamemode == GAME_BLOODBATH) + // Transfusion doesn't have a single player mode + if (gamemode == GAME_TRANSFUSION) { M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl.lmp"); M_DrawTextBox (60, 8 * 8, 23, 4); - M_PrintWhite (102, 10 * 8, "BloodBath is for"); + M_PrintWhite (95, 10 * 8, "Transfusion is for"); M_PrintWhite (83, 11 * 8, "multiplayer play only"); } else @@ -606,7 +605,7 @@ void M_SinglePlayer_Draw (void) void M_SinglePlayer_Key (int key) { - if (gamemode == GAME_BLOODBATH) + if (gamemode == GAME_TRANSFUSION) { if (key == K_ESCAPE || key == K_ENTER) m_state = m_main; @@ -856,7 +855,7 @@ void M_MultiPlayer_Draw (void) if (ipxAvailable || tcpipAvailable) return; - M_PrintWhite ((320/2) - ((27*8)/2), 148, "No Communications Available"); + M_PrintWhite ((320/2) - ((27*8)/2), 168, "No Communications Available"); } @@ -928,26 +927,52 @@ void M_Menu_Setup_f (void) } // LordHavoc: rewrote this code greatly -void M_MenuPlayerTranslate (qbyte *translation) +void M_MenuPlayerTranslate (qbyte *translation, int top, int bottom) { - int i, c; + int i; unsigned int trans[4096]; - qpic_t *p; + qbyte *data, *f; + static qbyte pixels[4096]; + static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load = true, menuplyr_failed = false; - p = W_GetLumpName ("gfx/menuplyr.lmp"); - if (!p) + if (menuplyr_failed) return; - c = p->width * p->height; - if (c > 4096) - { - Con_Printf("M_MenuPlayerTranslate: image larger than 4096 pixel buffer\n"); + if (menuplyr_top == top && menuplyr_bottom == bottom) return; + + menuplyr_top = top; + menuplyr_bottom = bottom; + + if (menuplyr_load) + { + menuplyr_load = false; + f = COM_LoadFile("gfx/menuplyr.lmp", true); + if (!f) + { + menuplyr_failed = true; + return; + } + data = LoadLMPAs8Bit (f, 0, 0); + Mem_Free(f); + if (image_width * image_height > 4096) + { + Con_Printf("M_MenuPlayerTranslate: image larger than 4096 pixel buffer\n"); + Mem_Free(data); + menuplyr_failed = true; + return; + } + menuplyr_width = image_width; + menuplyr_height = image_height; + memcpy(pixels, data, menuplyr_width * menuplyr_height); + Mem_Free(data); } - for (i = 0;i < c;i++) - trans[i] = d_8to24table[translation[((qbyte *)p->data)[i]]]; + M_BuildTranslationTable (menuplyr_top*16, menuplyr_bottom*16); + + for (i = 0;i < menuplyr_width * menuplyr_height;i++) + trans[i] = palette_complete[translation[pixels[i]]]; - Draw_NewPic("gfx/menuplyr.lmp", p->width, p->height, true, (qbyte *)trans); + Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)trans); } void M_Setup_Draw (void) @@ -975,8 +1000,7 @@ void M_Setup_Draw (void) M_DrawPic (160, 64, "gfx/bigbox.lmp"); // LordHavoc: rewrote this code greatly - M_BuildTranslationTable (setup_top*16, setup_bottom*16); - M_MenuPlayerTranslate (translationTable); + M_MenuPlayerTranslate (translationTable, setup_top, setup_bottom); M_DrawPic (172, 72, "gfx/menuplyr.lmp"); M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1)); @@ -1088,14 +1112,14 @@ forward: } } - if (setup_top > 13) + if (setup_top > 15) setup_top = 0; if (setup_top < 0) - setup_top = 13; - if (setup_bottom > 13) + setup_top = 15; + if (setup_bottom > 15) setup_bottom = 0; if (setup_bottom < 0) - setup_bottom = 13; + setup_bottom = 15; } //============================================================================= @@ -1221,10 +1245,34 @@ again: //============================================================================= /* OPTIONS MENU */ -#define OPTIONS_ITEMS 27 - #define SLIDER_RANGE 10 +void M_DrawSlider (int x, int y, float range) +{ + int i; + + if (range < 0) + range = 0; + if (range > 1) + range = 1; + M_DrawCharacter (x-8, y, 128); + for (i=0 ; i 200) { Cvar_SetValueQuick (&cl_forwardspeed, 200); @@ -1305,52 +1353,27 @@ void M_AdjustSliders (int dir) Cvar_SetValueQuick (&cl_backspeed, 400); } break; - case 21: // lookspring + case 22: // lookspring Cvar_SetValueQuick (&lookspring, !lookspring.integer); break; - case 22: // lookstrafe + case 23: // lookstrafe Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer); break; - case 23: // mouse speed + case 24: // mouse speed Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50)); break; - case 24: // mouse look + case 25: // mouse look Cvar_SetValueQuick (&freelook, !freelook.integer); break; - case 25: // invert mouse + case 26: // invert mouse Cvar_SetValueQuick (&m_pitch, -m_pitch.value); break; - case 26: // windowed mouse + case 27: // windowed mouse Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer); break; } } - -void M_DrawSlider (int x, int y, float range) -{ - int i; - - if (range < 0) - range = 0; - if (range > 1) - range = 1; - M_DrawCharacter (x-8, y, 128); - for (i=0 ; i 200);y += 8; M_Print(16, y, " Lookspring");M_DrawCheckbox(220, y, lookspring.integer);y += 8; @@ -1417,11 +1441,13 @@ void M_Options_Key (int k) Cbuf_AddText ("exec default.cfg\n"); break; case 3: - if (vid_menudrawfn) - M_Menu_Video_f (); + M_Menu_Video_f (); + break; + case 4: + M_Menu_Options_Effects_f (); break; default: - M_AdjustSliders (1); + M_Menu_Options_AdjustSliders (1); break; } return; @@ -1441,11 +1467,165 @@ void M_Options_Key (int k) break; case K_LEFTARROW: - M_AdjustSliders (-1); + M_Menu_Options_AdjustSliders (-1); break; case K_RIGHTARROW: - M_AdjustSliders (1); + M_Menu_Options_AdjustSliders (1); + break; + } +} + +#define OPTIONS_EFFECTS_ITEMS 16 + +int options_effects_cursor; + +void M_Menu_Options_Effects_f (void) +{ + key_dest = key_menu; + m_state = m_options_effects; + m_entersound = true; +} + + +extern cvar_t r_detailtextures; +extern cvar_t cl_particles; +extern cvar_t cl_explosions; +extern cvar_t cl_stainmaps; +extern cvar_t r_explosionclip; +extern cvar_t r_dlightmap; +extern cvar_t r_modellights; +extern cvar_t r_coronas; +extern cvar_t gl_flashblend; +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_size; +extern cvar_t cl_particles_blood_alpha; + +void M_Menu_Options_Effects_AdjustSliders (int dir) +{ + S_LocalSound ("misc/menu3.wav"); + + switch (options_effects_cursor) + { + case 0: + Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8)); + break; + case 1: + Cvar_SetValueQuick (&r_dlightmap, !r_dlightmap.integer); + break; + case 2: + Cvar_SetValueQuick (&r_coronas, !r_coronas.integer); + break; + case 3: + Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer); + break; + case 4: + Cvar_SetValueQuick (&cl_particles, !cl_particles.integer); + break; + case 5: + Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer); + break; + case 6: + Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer); + break; + case 7: + Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer); + break; + case 8: + Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer); + break; + case 9: + Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer); + break; + case 10: + Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer); + break; + case 11: + Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer); + break; + case 12: + Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer); + break; + case 13: + Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer); + break; + case 14: + Cvar_SetValueQuick (&cl_particles_blood_size, bound(2, cl_particles_blood_size.value + dir * 1, 20)); + break; + case 15: + Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1)); + break; + } +} + +void M_Options_Effects_Draw (void) +{ + float y; + cachepic_t *p; + + M_DrawPic(16, 4, "gfx/qplaque.lmp"); + p = Draw_CachePic("gfx/p_option.lmp"); + M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); + + y = 32; + M_Print(16, y, " Lights Per Model");M_DrawSlider(220, y, r_modellights.value / 8);y += 8; + M_Print(16, y, " Fast Dynamic Lighting");M_DrawCheckbox(220, y, !r_dlightmap.integer);y += 8; + M_Print(16, y, " Coronas");M_DrawCheckbox(220, y, r_coronas.integer);y += 8; + M_Print(16, y, " Use Only Coronas");M_DrawCheckbox(220, y, gl_flashblend.integer);y += 8; + M_Print(16, y, " Particles");M_DrawCheckbox(220, y, cl_particles.integer);y += 8; + M_Print(16, y, " Explosions");M_DrawCheckbox(220, y, cl_explosions.integer);y += 8; + M_Print(16, y, " Explosion Clipping");M_DrawCheckbox(220, y, r_explosionclip.integer);y += 8; + M_Print(16, y, " Stainmaps");M_DrawCheckbox(220, y, cl_stainmaps.integer);y += 8; + M_Print(16, y, " Detail Texturing");M_DrawCheckbox(220, y, r_detailtextures.integer);y += 8; + M_Print(16, y, " Bullet Impacts");M_DrawCheckbox(220, y, cl_particles_bulletimpacts.integer);y += 8; + M_Print(16, y, " Smoke");M_DrawCheckbox(220, y, cl_particles_smoke.integer);y += 8; + M_Print(16, y, " Sparks");M_DrawCheckbox(220, y, cl_particles_sparks.integer);y += 8; + M_Print(16, y, " Bubbles");M_DrawCheckbox(220, y, cl_particles_bubbles.integer);y += 8; + M_Print(16, y, " Blood");M_DrawCheckbox(220, y, cl_particles_blood.integer);y += 8; + M_Print(16, y, " Blood Size");M_DrawSlider(220, y, (cl_particles_blood_size.value - 2) / 18);y += 8; + M_Print(16, y, " Blood Opacity");M_DrawSlider(220, y, (cl_particles_blood_alpha.value - 0.2) / 0.8);y += 8; + + // cursor + M_DrawCharacter(200, 32 + options_effects_cursor*8, 12+((int)(realtime*4)&1)); +} + + +void M_Options_Effects_Key (int k) +{ + switch (k) + { + case K_ESCAPE: + M_Menu_Options_f (); + break; + + case K_ENTER: + M_Menu_Options_Effects_AdjustSliders (1); + break; + + case K_UPARROW: + S_LocalSound ("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"); + options_effects_cursor++; + if (options_effects_cursor >= OPTIONS_EFFECTS_ITEMS) + options_effects_cursor = 0; + break; + + case K_LEFTARROW: + M_Menu_Options_Effects_AdjustSliders (-1); + break; + + case K_RIGHTARROW: + M_Menu_Options_Effects_AdjustSliders (1); break; } } @@ -1453,11 +1633,35 @@ void M_Options_Key (int k) //============================================================================= /* KEYS MENU */ -char *bindnames[][2] = +char *quakebindnames[][2] = +{ +{"+attack", "attack"}, +{"impulse 10", "next weapon"}, +{"impulse 12", "previous weapon"}, +{"+jump", "jump / swim up"}, +{"+forward", "walk forward"}, +{"+back", "backpedal"}, +{"+left", "turn left"}, +{"+right", "turn right"}, +{"+speed", "run"}, +{"+moveleft", "step left"}, +{"+moveright", "step right"}, +{"+strafe", "sidestep"}, +{"+lookup", "look up"}, +{"+lookdown", "look down"}, +{"centerview", "center view"}, +{"+mlook", "mouse look"}, +{"+klook", "keyboard look"}, +{"+moveup", "swim up"}, +{"+movedown", "swim down"} +}; + +char *transfusionbindnames[][2] = { -#ifdef BLOODBATH {"+forward", "walk forward"}, {"+back", "backpedal"}, +{"+left", "turn left"}, +{"+right", "turn right"}, {"+moveleft", "step left"}, {"+moveright", "step right"}, {"+jump", "jump / swim up"}, @@ -1486,30 +1690,10 @@ char *bindnames[][2] = {"impulse 141", "identify player"}, {"impulse 16", "next armor type"}, {"impulse 20", "observer mode"} -#else // not BLOODBATH -{"+attack", "attack"}, -{"impulse 10", "next weapon"}, -{"impulse 12", "previous weapon"}, -{"+jump", "jump / swim up"}, -{"+forward", "walk forward"}, -{"+back", "backpedal"}, -{"+left", "turn left"}, -{"+right", "turn right"}, -{"+speed", "run"}, -{"+moveleft", "step left"}, -{"+moveright", "step right"}, -{"+strafe", "sidestep"}, -{"+lookup", "look up"}, -{"+lookdown", "look down"}, -{"centerview", "center view"}, -{"+mlook", "mouse look"}, -{"+klook", "keyboard look"}, -{"+moveup", "swim up"}, -{"+movedown", "swim down"} -#endif // not BLOODBATH }; -#define NUMCOMMANDS (sizeof(bindnames)/sizeof(bindnames[0])) +int numcommands; +char *(*bindnames)[2]; /* typedef struct binditem_s @@ -1672,7 +1856,7 @@ void M_Keys_Draw (void) M_Print (18, 32, "Enter to change, backspace to clear"); // search for known bindings - for (i=0 ; i= NUMCOMMANDS) + if (keys_cursor >= numcommands) keys_cursor = 0; break; @@ -1769,23 +1953,165 @@ void M_Keys_Key (int k) //============================================================================= /* VIDEO MENU */ +#define VIDEO_ITEMS 5 + +int video_cursor = 0; +int video_cursor_table[] = {56, 68, 80, 92, 116}; +unsigned short video_resolutions[][2] = {{512,384}, {640,480}, {800,600}, {1024,768}, {1280,960}}; +int video_resolution; + +extern int current_vid_fullscreen; +extern int current_vid_width; +extern int current_vid_height; +extern int current_vid_bitsperpixel; +extern int current_vid_stencil; + + void M_Menu_Video_f (void) { key_dest = key_menu; m_state = m_video; m_entersound = true; + + // Look for the current resolution + for (video_resolution = 0; video_resolution < (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0])); video_resolution++) + { + if (video_resolutions[video_resolution][0] == current_vid_width && + video_resolutions[video_resolution][1] == current_vid_height) + break; + } + + // Default to 800x600 if we didn't find it + if (video_resolution == sizeof (video_resolutions) / sizeof (video_resolutions[0])) + { + video_resolution = 2; + Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]); + Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]); + } } void M_Video_Draw (void) { - (*vid_menudrawfn) (); + cachepic_t *p; + const char* string; + + M_DrawPic(16, 4, "gfx/qplaque.lmp"); + p = Draw_CachePic("gfx/vidmodes.lmp"); + M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes.lmp"); + + // Resolution + M_Print(16, video_cursor_table[0], " Resolution"); + string = va("%dx%d", video_resolutions[video_resolution][0], video_resolutions[video_resolution][1]); + M_Print (220, video_cursor_table[0], string); + + // Bits per pixel + M_Print(16, video_cursor_table[1], " Bits per pixel"); + M_Print (220, video_cursor_table[1], (vid_bitsperpixel.integer == 32) ? "32" : "16"); + + // Fullscreen + M_Print(16, video_cursor_table[2], " Fullscreen"); + M_DrawCheckbox(220, video_cursor_table[2], vid_fullscreen.integer); + + // Stencil + M_Print(16, video_cursor_table[3], " Stencil"); + M_DrawCheckbox(220, video_cursor_table[3], vid_stencil.integer); + + // "Apply" button + M_Print(220, video_cursor_table[4], "Apply"); + + // Cursor + M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1)); +} + + +void M_Menu_Video_AdjustSliders (int dir) +{ + S_LocalSound ("misc/menu3.wav"); + + switch (video_cursor) + { + // Resolution + case 0: + { + int new_resolution = video_resolution + dir; + if (new_resolution < 0) + video_resolution = sizeof (video_resolutions) / sizeof (video_resolutions[0]) - 1; + else if (new_resolution > (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0]) - 1)) + video_resolution = 0; + else + video_resolution = new_resolution; + + Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]); + Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]); + break; + } + + // Bits per pixel + case 1: + Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32); + break; + case 2: + Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer); + break; + case 3: + Cvar_SetValueQuick (&vid_stencil, !vid_stencil.integer); + break; + } } void M_Video_Key (int key) { - (*vid_menukeyfn) (key); + switch (key) + { + 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_stencil, current_vid_stencil); + + S_LocalSound ("misc/menu1.wav"); + M_Menu_Options_f (); + break; + + case K_ENTER: + m_entersound = true; + switch (video_cursor) + { + case 4: + Cbuf_AddText ("vid_restart\n"); + M_Menu_Options_f (); + break; + default: + M_Menu_Video_AdjustSliders (1); + } + break; + + case K_UPARROW: + S_LocalSound ("misc/menu1.wav"); + video_cursor--; + if (video_cursor < 0) + video_cursor = VIDEO_ITEMS-1; + break; + + case K_DOWNARROW: + S_LocalSound ("misc/menu1.wav"); + video_cursor++; + if (video_cursor >= VIDEO_ITEMS) + video_cursor = 0; + break; + + case K_LEFTARROW: + M_Menu_Video_AdjustSliders (-1); + break; + + case K_RIGHTARROW: + M_Menu_Video_AdjustSliders (1); + break; + } } //============================================================================= @@ -1944,7 +2270,6 @@ void M_Quit_Key (int key) case 'Y': case 'y': - key_dest = key_console; Host_Quit_f (); break; @@ -1968,8 +2293,8 @@ void M_Quit_Draw (void) /* LAN CONFIG MENU */ int lanConfig_cursor = -1; -int lanConfig_cursor_table [] = {72, 92, 124}; -#define NUM_LANCONFIG_CMDS 3 +int lanConfig_cursor_table [] = {72, 92, 112, 144}; +#define NUM_LANCONFIG_CMDS 4 int lanConfig_port; char lanConfig_portname[6]; @@ -2033,9 +2358,10 @@ void M_LanConfig_Draw (void) if (JoiningGame) { M_Print (basex, lanConfig_cursor_table[1], "Search for local games..."); - M_Print (basex, 108, "Join game at:"); - M_DrawTextBox (basex+8, lanConfig_cursor_table[2]-8, 22, 1); - M_Print (basex+16, lanConfig_cursor_table[2], lanConfig_joinname); + M_Print (basex, lanConfig_cursor_table[2], "Search for internet games..."); + M_Print (basex, 128, "Join game at:"); + M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, 22, 1); + M_Print (basex+16, lanConfig_cursor_table[3], lanConfig_joinname); } else { @@ -2048,11 +2374,11 @@ void M_LanConfig_Draw (void) if (lanConfig_cursor == 0) M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [0], 10+((int)(realtime*4)&1)); - if (lanConfig_cursor == 2) - M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [2], 10+((int)(realtime*4)&1)); + if (lanConfig_cursor == 3) + M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [3], 10+((int)(realtime*4)&1)); if (*m_return_reason) - M_PrintWhite (basex, 148, m_return_reason); + M_PrintWhite (basex, 168, m_return_reason); } @@ -2088,18 +2414,21 @@ void M_LanConfig_Key (int key) M_ConfigureNetSubsystem (); - if (lanConfig_cursor == 1) + if (lanConfig_cursor == 1 || lanConfig_cursor == 2) { if (StartingGame) { M_Menu_GameOptions_f (); break; } - M_Menu_Search_f(); + if (lanConfig_cursor == 1) + M_Menu_Search_f(); + else + M_Menu_InetSearch_f(); break; } - if (lanConfig_cursor == 2) + if (lanConfig_cursor == 3) { m_return_state = m_state; m_return_onerror = true; @@ -2118,7 +2447,7 @@ void M_LanConfig_Key (int key) lanConfig_portname[strlen(lanConfig_portname)-1] = 0; } - if (lanConfig_cursor == 2) + if (lanConfig_cursor == 3) { if (strlen(lanConfig_joinname)) lanConfig_joinname[strlen(lanConfig_joinname)-1] = 0; @@ -2129,7 +2458,7 @@ void M_LanConfig_Key (int key) if (key < 32 || key > 127) break; - if (lanConfig_cursor == 2) + if (lanConfig_cursor == 3) { l = strlen(lanConfig_joinname); if (l < 21) @@ -2152,7 +2481,7 @@ void M_LanConfig_Key (int key) } } - if (StartingGame && lanConfig_cursor == 2) + if (StartingGame && lanConfig_cursor == 3) { if (key == K_UPARROW) lanConfig_cursor = 1; @@ -2355,8 +2684,8 @@ episode_t nehahraepisodes[] = {"Dimension of the Lost", 17, 2} }; -// Map list for BloodBath -level_t bloodbathlevels[] = +// Map list for Transfusion +level_t transfusionlevels[] = { {"bb1", "The Stronghold"}, {"bb2", "Winter Wonderland"}, @@ -2366,8 +2695,12 @@ level_t bloodbathlevels[] = {"bb6", "Twin Fortress"}, {"bb7", "Midgard"}, {"bb8", "Fun With Heads"}, + {"e1m1", "Cradle to Grave"}, + {"e1m2", "Wrong Side of the Tracks"}, {"e1m7", "Altar of Stone"}, + {"e3m7", "The Pit of Cerberus"}, + {"e4m8", "The Hall of the Epiphany"}, {"dm1", "Monolith Building 11"}, {"dm2", "Power!"}, @@ -2375,9 +2708,7 @@ level_t bloodbathlevels[] = {"e6m8", "Beauty and the Beast"}, {"cpbb01", "Crypt of Despair"}, - {"cpbb02", "Pits of Blood"}, {"cpbb03", "Unholy Cathedral"}, - {"cpbb04", "Deadly Inspirations"}, {"b2a15", "Area 15 (B2)"}, {"barena", "Blood Arena"}, @@ -2386,21 +2717,28 @@ level_t bloodbathlevels[] = {"crypt", "The Crypt"}, {"bb3_2k1", "Bodies Infusion"}, + {"dcamp", "DeathCamp"}, + {"highnoon", "HighNoon"}, {"qbb1", "The Confluence"}, {"qbb2", "KathartiK"}, {"qbb3", "Caleb's Woodland Retreat"}, - {"ded_simp", "Dead Simple"}, + {"dranzbb6", "Black Coffee"}, - {"qe1m7", "The House of Chthon"} + {"fragm", "Frag'M"}, + {"maim", "Maim"}, + {"qe1m7", "The House of Chthon"}, + {"simple", "Dead Simple"} }; -episode_t bloodbathepisodes[] = +episode_t transfusionepisodes[] = { - {"Blood", 0, 10}, - {"Plasma Pack", 10, 4}, - {"Cryptic Passage", 14, 4}, - {"Blood 2", 18, 5}, - {"BloodBath", 23, 7} + {"Blood", 0, 8}, + {"Blood Single Player", 8, 5}, + {"Plasma Pack", 13, 4}, + {"Cryptic Passage", 17, 2}, + {"Blood 2", 19, 5}, + {"Transfusion", 24, 6}, + {"Conversions", 30, 5} }; gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2}; @@ -2408,7 +2746,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 bloodbathgame = {"BloodBath", bloodbathlevels, bloodbathepisodes, 5}; +gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 7}; typedef struct { @@ -2424,9 +2762,7 @@ gameinfo_t gamelist[] = {GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame}, {GAME_ROGUE, &roguegame, &roguegame}, {GAME_NEHAHRA, &nehahragame, &nehahragame}, - {GAME_FIENDARENA, &sharewarequakegame, ®isteredquakegame}, - {GAME_ZYMOTIC, &sharewarequakegame, ®isteredquakegame}, - {GAME_BLOODBATH, &bloodbathgame, &bloodbathgame}, + {GAME_TRANSFUSION, &transfusiongame, &transfusiongame}, {-1, &sharewarequakegame, ®isteredquakegame} // final fallback }; @@ -2454,7 +2790,7 @@ void M_Menu_GameOptions_f (void) if (maxplayers == 0) maxplayers = svs.maxclients; if (maxplayers < 2) - maxplayers = svs.maxclientslimit; + maxplayers = MAX_SCOREBOARD; } @@ -2479,7 +2815,7 @@ void M_GameOptions_Draw (void) M_Print (160, 56, va("%i", maxplayers) ); M_Print (0, 64, " Game Type"); - if (gamemode == GAME_BLOODBATH) + if (gamemode == GAME_TRANSFUSION) { if (!deathmatch.integer) Cvar_SetValue("deathmatch", 1); @@ -2515,7 +2851,7 @@ void M_GameOptions_Draw (void) } M_Print (160, 72, msg); } - else if (gamemode == GAME_BLOODBATH) + else if (gamemode == GAME_TRANSFUSION) { char *msg; @@ -2584,7 +2920,7 @@ void M_GameOptions_Draw (void) M_Print (x, 146, " More than 64 players?? "); M_Print (x, 154, " First, question your "); M_Print (x, 162, " sanity, then email "); - M_Print (x, 170, " havoc@gamevisions.com "); + M_Print (x, 170, " havoc@telefragged.com "); } else { @@ -2603,9 +2939,9 @@ void M_NetStart_Change (int dir) { case 1: maxplayers += dir; - if (maxplayers > svs.maxclientslimit) + if (maxplayers > MAX_SCOREBOARD) { - maxplayers = svs.maxclientslimit; + maxplayers = MAX_SCOREBOARD; m_serverInfoMessage = true; m_serverInfoMessageTime = realtime; } @@ -2614,7 +2950,7 @@ void M_NetStart_Change (int dir) break; case 2: - if (gamemode == GAME_BLOODBATH) + if (gamemode == GAME_TRANSFUSION) { if (deathmatch.integer == 2) // changing from CTF to BloodBath Cvar_SetValueQuick (&deathmatch, 0); @@ -2777,6 +3113,7 @@ void M_Menu_Search_f (void) void M_Search_Draw (void) { + const char* string; cachepic_t *p; int x; @@ -2804,7 +3141,11 @@ void M_Search_Draw (void) return; } - M_PrintWhite ((320/2) - ((22*8)/2), 64, "No Quake servers found"); + if (gamemode == GAME_TRANSFUSION) + string = "No Transfusion servers found"; + else + string = "No Quake servers found"; + M_PrintWhite ((320/2) - ((22*8)/2), 64, string); if ((realtime - searchCompleteTime) < 3.0) return; @@ -2816,6 +3157,32 @@ void M_Search_Key (int key) { } +//============================================================================= +/* INTERNET SEARCH MENU */ + +void M_Menu_InetSearch_f (void) +{ + key_dest = key_menu; + m_state = m_search; + m_entersound = false; + slistSilent = true; + slistLocal = false; + searchComplete = false; + NET_InetSlist_f(); + +} + + +void M_InetSearch_Draw (void) +{ + M_Search_Draw (); // it's the same one, so why bother? +} + + +void M_InetSearch_Key (int key) +{ +} + //============================================================================= /* SLIST MENU */ @@ -2871,7 +3238,7 @@ void M_ServerList_Draw (void) M_DrawCharacter (0, 32 + slist_cursor*8, 12+((int)(realtime*4)&1)); if (*m_return_reason) - M_PrintWhite (16, 148, m_return_reason); + M_PrintWhite (16, 168, m_return_reason); } @@ -2934,11 +3301,23 @@ void M_Init (void) Cmd_AddCommand ("menu_multiplayer", M_Menu_MultiPlayer_f); Cmd_AddCommand ("menu_setup", M_Menu_Setup_f); Cmd_AddCommand ("menu_options", M_Menu_Options_f); + Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f); Cmd_AddCommand ("menu_keys", M_Menu_Keys_f); Cmd_AddCommand ("menu_video", M_Menu_Video_f); Cmd_AddCommand ("help", M_Menu_Help_f); Cmd_AddCommand ("menu_quit", M_Menu_Quit_f); + if (gamemode == GAME_TRANSFUSION) + { + numcommands = sizeof(transfusionbindnames) / sizeof(transfusionbindnames[0]); + bindnames = transfusionbindnames; + } + else + { + numcommands = sizeof(quakebindnames) / sizeof(quakebindnames[0]); + bindnames = quakebindnames; + } + if (gamemode == GAME_NEHAHRA) { if (COM_FileExists("maps/neh1m4.bsp")) @@ -3018,6 +3397,10 @@ void M_Draw (void) M_Options_Draw (); break; + case m_options_effects: + M_Options_Effects_Draw (); + break; + case m_keys: M_Keys_Draw (); break; @@ -3104,6 +3487,10 @@ void M_Keydown (int key) M_Options_Key (key); return; + case m_options_effects: + M_Options_Effects_Key (key); + return; + case m_keys: M_Keys_Key (key); return;