X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=fd3bee903a50ac50fa5da2bcd587b93007fa1d2b;hp=10439bd4ce76eefc6e57fb05343c8f99b7c4b10d;hb=a5aa71031ee91b1a82396a56bcaeb151bdfa57d5;hpb=8dc85371a08736caa586c70285da5c42fb145ce8 diff --git a/menu.c b/menu.c index 10439bd4..fd3bee90 100644 --- a/menu.c +++ b/menu.c @@ -20,11 +20,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "image.h" +#include "mprogdefs.h" #define TYPE_DEMO 1 #define TYPE_GAME 2 #define TYPE_BOTH 3 +mempool_t *menu_mempool; + int NehGameType; enum m_state_e m_state; @@ -63,22 +66,22 @@ void M_LanConfig_Draw (void); void M_GameOptions_Draw (void); void M_ServerList_Draw (void); -void M_Main_Key (int key); - void M_SinglePlayer_Key (int key); - void M_Load_Key (int key); - void M_Save_Key (int key); - void M_MultiPlayer_Key (int key); - void M_Setup_Key (int key); - void M_Options_Key (int key); - void M_Options_Effects_Key (int key); - void M_Options_ColorControl_Key (int key); - void M_Keys_Key (int key); - void M_Video_Key (int key); - void M_Help_Key (int key); - void M_Quit_Key (int key); -void M_LanConfig_Key (int key); -void M_GameOptions_Key (int key); -void M_ServerList_Key (int key); +void M_Main_Key (int key, char ascii); + void M_SinglePlayer_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); + void M_Setup_Key (int key, char ascii); + void M_Options_Key (int key, char ascii); + void M_Options_Effects_Key (int key, char ascii); + void M_Options_ColorControl_Key (int key, char ascii); + void M_Keys_Key (int key, char ascii); + void M_Video_Key (int key, char ascii); + void M_Help_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); +void M_ServerList_Key (int key, char ascii); qboolean m_entersound; // play after drawing a frame, so caching // won't disrupt the sound @@ -142,8 +145,8 @@ void M_Background(int width, int height) menu_height = height; 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); - //DrawQ_Fill(0, 0, vid.conwidth, vid.conheight, 0, 0, 0, 0.5, 0); + //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); } /* @@ -161,17 +164,17 @@ 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, const 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, const char *str) +void M_PrintRed (float cx, float cy, const char *str) { - DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0); + DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0); } -void M_ItemPrint (float cx, float cy, char *str, int unghosted) +void M_ItemPrint(float cx, float cy, char *str, int unghosted) { if (unghosted) DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0); @@ -291,7 +294,7 @@ void M_Demo_Draw (void) M_Background(320, 200); for (i = 0;i < NumberOfNehahraDemos;i++) - M_Print (16, 16 + 8*i, NehahraDemos[i].desc); + M_Print(16, 16 + 8*i, NehahraDemos[i].desc); // line cursor M_DrawCharacter (8, 16 + demo_cursor*8, 12+((int)(realtime*4)&1)); @@ -305,7 +308,7 @@ void M_Menu_Demos_f (void) m_entersound = true; } -void M_Demo_Key (int k) +void M_Demo_Key (int k, char ascii) { switch (k) { @@ -325,14 +328,14 @@ void M_Demo_Key (int k) S_LocalSound ("misc/menu1.wav"); demo_cursor--; if (demo_cursor < 0) - demo_cursor = NumberOfNehahraDemos; + demo_cursor = NumberOfNehahraDemos-1; break; case K_DOWNARROW: case K_RIGHTARROW: S_LocalSound ("misc/menu1.wav"); demo_cursor++; - if (demo_cursor > NumberOfNehahraDemos) + if (demo_cursor >= NumberOfNehahraDemos) demo_cursor = 0; break; } @@ -401,7 +404,7 @@ void M_Main_Draw (void) } -void M_Main_Key (int key) +void M_Main_Key (int key, char ascii) { switch (key) { @@ -568,16 +571,20 @@ void M_SinglePlayer_Draw (void) p = Draw_CachePic ("gfx/ttl_sgl.lmp"); // Transfusion doesn't have a single player mode - if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ) + if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl.lmp"); M_DrawTextBox (60, 8 * 8, 23, 4); if (gamemode == GAME_NEXUIZ) - M_PrintWhite (95, 10 * 8, "Nexuiz is for"); + 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) + M_Print(95, 10 * 8, "Battlemech is for"); else - M_PrintWhite (95, 10 * 8, "Transfusion is for"); - M_PrintWhite (83, 11 * 8, "multiplayer play only"); + M_Print(95, 10 * 8, "Transfusion is for"); + M_Print(83, 11 * 8, "multiplayer play only"); } else { @@ -593,9 +600,9 @@ void M_SinglePlayer_Draw (void) } -void M_SinglePlayer_Key (int key) +void M_SinglePlayer_Key (int key, char ascii) { - if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ) + if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { if (key == K_ESCAPE || key == K_ENTER) m_state = m_main; @@ -677,7 +684,7 @@ void M_ScanSaves (void) str = FS_Getline (f); sscanf (str, "%i\n", &version); str = FS_Getline (f); - strncpy (m_filenames[i], str, sizeof(m_filenames[i])-1); + strlcpy (m_filenames[i], str, sizeof (m_filenames[i])); // change _ back to space for (j=0 ; jwidth)/2, 4, "gfx/p_load.lmp"); for (i=0 ; i< MAX_SAVEGAMES; i++) - M_Print (16, 32 + 8*i, m_filenames[i]); + M_Print(16, 32 + 8*i, m_filenames[i]); // line cursor M_DrawCharacter (8, 32 + load_cursor*8, 12+((int)(realtime*4)&1)); @@ -741,14 +748,14 @@ void M_Save_Draw (void) M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp"); for (i=0 ; i> 4; setup_bottom = setup_oldbottom = cl_color.integer & 15; + setup_rate = cl_rate.integer; } -// LordHavoc: rewrote this code greatly -void M_MenuPlayerTranslate (qbyte *translation, int top, int bottom) -{ - int i; - unsigned int trans[4096]; - qbyte *data, *f; - static qbyte pixels[4096]; - static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load = true, menuplyr_failed = false; - - if (menuplyr_failed) - return; - if (menuplyr_top == top && menuplyr_bottom == bottom) - return; - - menuplyr_top = top; - menuplyr_bottom = bottom; +static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load; +static qbyte *menuplyr_pixels; +static unsigned int *menuplyr_translated; - if (menuplyr_load) - { - menuplyr_load = false; - f = FS_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); - } - - M_BuildTranslationTable (menuplyr_top*16, menuplyr_bottom*16); - - for (i = 0;i < menuplyr_width * menuplyr_height;i++) - trans[i] = palette_complete[translation[pixels[i]]]; +typedef struct ratetable_s +{ + int rate; + char *name; +} +ratetable_t; + +#define RATES ((int)(sizeof(setup_ratetable)/sizeof(setup_ratetable[0]))) +static ratetable_t setup_ratetable[] = +{ + {1000, "28.8 bad"}, + {1500, "28.8 mediocre"}, + {2000, "28.8 good"}, + {2500, "33.6 mediocre"}, + {3000, "33.6 good"}, + {3500, "56k bad"}, + {4000, "56k mediocre"}, + {4500, "56k adequate"}, + {5000, "56k good"}, + {7000, "64k ISDN"}, + {15000, "128k ISDN"}, + {25000, "broadband"} +}; - Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)trans); +static int setup_rateindex(int rate) +{ + int i; + for (i = 0;i < RATES;i++) + if (setup_ratetable[i].rate > setup_rate) + break; + return bound(1, i, RATES) - 1; } void M_Setup_Draw (void) { + int i; cachepic_t *p; M_Background(320, 200); @@ -972,37 +968,65 @@ void M_Setup_Draw (void) p = Draw_CachePic ("gfx/p_multi.lmp"); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); - M_Print (64, 40, "Hostname"); + M_Print(64, 40, "Your name"); M_DrawTextBox (160, 32, 16, 1); - M_Print (168, 40, setup_hostname); + M_Print(168, 40, setup_myname); - M_Print (64, 56, "Your name"); - M_DrawTextBox (160, 48, 16, 1); - M_Print (168, 56, setup_myname); + if (gamemode != GAME_GOODVSBAD2) + { + M_Print(64, 64, "Shirt color"); + M_Print(64, 88, "Pants color"); + } - M_Print (64, 80, "Shirt color"); - M_Print (64, 104, "Pants color"); + M_Print(64, 124-8, "Network speed limit"); + M_Print(168, 124, va("%i (%s)", setup_rate, setup_ratetable[setup_rateindex(setup_rate)].name)); M_DrawTextBox (64, 140-8, 14, 1); - M_Print (72, 140, "Accept Changes"); - - M_DrawPic (160, 64, "gfx/bigbox.lmp"); + M_Print(72, 140, "Accept Changes"); // LordHavoc: rewrote this code greatly - M_MenuPlayerTranslate (translationTable, setup_top, setup_bottom); - M_DrawPic (172, 72, "gfx/menuplyr.lmp"); + if (menuplyr_load) + { + qbyte *data, *f; + menuplyr_load = false; + menuplyr_top = -1; + menuplyr_bottom = -1; + if ((f = FS_LoadFile("gfx/menuplyr.lmp", true))) + { + data = LoadLMPAs8Bit (f, 0, 0); + 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); + memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height); + Mem_Free(data); + } + } - M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1)); + if (menuplyr_pixels) + { + if (menuplyr_top != setup_top || menuplyr_bottom != setup_bottom) + { + menuplyr_top = setup_top; + menuplyr_bottom = setup_bottom; + M_BuildTranslationTable(menuplyr_top*16, menuplyr_bottom*16); + for (i = 0;i < menuplyr_width * menuplyr_height;i++) + menuplyr_translated[i] = palette_complete[translationTable[menuplyr_pixels[i]]]; + Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)menuplyr_translated); + } + M_DrawPic(160, 48, "gfx/bigbox.lmp"); + M_DrawPic(172, 56, "gfx/menuplyr.lmp"); + } if (setup_cursor == 0) - M_DrawCharacter (168 + 8*strlen(setup_hostname), setup_cursor_table [setup_cursor], 10+((int)(realtime*4)&1)); - - if (setup_cursor == 1) M_DrawCharacter (168 + 8*strlen(setup_myname), setup_cursor_table [setup_cursor], 10+((int)(realtime*4)&1)); + else + M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1)); } -void M_Setup_Key (int k) +void M_Setup_Key (int k, char ascii) { int l; @@ -1027,37 +1051,49 @@ void M_Setup_Key (int k) break; case K_LEFTARROW: - if (setup_cursor < 2) + if (setup_cursor < 1) return; S_LocalSound ("misc/menu3.wav"); - if (setup_cursor == 2) + if (setup_cursor == 1) setup_top = setup_top - 1; - if (setup_cursor == 3) + if (setup_cursor == 2) setup_bottom = setup_bottom - 1; + if (setup_cursor == 3) + { + l = setup_rateindex(setup_rate) - 1; + if (l < 0) + l = RATES - 1; + setup_rate = setup_ratetable[l].rate; + } break; case K_RIGHTARROW: - if (setup_cursor < 2) + if (setup_cursor < 1) return; forward: S_LocalSound ("misc/menu3.wav"); - if (setup_cursor == 2) + if (setup_cursor == 1) setup_top = setup_top + 1; - if (setup_cursor == 3) + if (setup_cursor == 2) setup_bottom = setup_bottom + 1; + if (setup_cursor == 3) + { + l = setup_rateindex(setup_rate) + 1; + if (l >= RATES) + l = 0; + setup_rate = setup_ratetable[l].rate; + } break; case K_ENTER: - if (setup_cursor == 0 || setup_cursor == 1) + if (setup_cursor == 0) return; - if (setup_cursor == 2 || setup_cursor == 3) + if (setup_cursor == 1 || setup_cursor == 2 || setup_cursor == 3) goto forward; - // setup_cursor == 4 (OK) + // setup_cursor == 4 (Accept changes) if (strcmp(cl_name.string, setup_myname) != 0) Cbuf_AddText ( va ("name \"%s\"\n", setup_myname) ); - if (strcmp(hostname.string, setup_hostname) != 0) - Cvar_Set("hostname", setup_hostname); if (setup_top != setup_oldtop || setup_bottom != setup_oldbottom) Cbuf_AddText( va ("color %i %i\n", setup_top, setup_bottom) ); m_entersound = true; @@ -1066,12 +1102,6 @@ forward: case K_BACKSPACE: if (setup_cursor == 0) - { - if (strlen(setup_hostname)) - setup_hostname[strlen(setup_hostname)-1] = 0; - } - - if (setup_cursor == 1) { if (strlen(setup_myname)) setup_myname[strlen(setup_myname)-1] = 0; @@ -1079,24 +1109,15 @@ forward: break; default: - if (k < 32 || k > 127) + if (ascii < 32 || ascii > 126) break; if (setup_cursor == 0) - { - l = strlen(setup_hostname); - if (l < 15) - { - setup_hostname[l+1] = 0; - setup_hostname[l] = k; - } - } - if (setup_cursor == 1) { l = strlen(setup_myname); if (l < 15) { setup_myname[l+1] = 0; - setup_myname[l] = k; + setup_myname[l] = ascii; } } } @@ -1127,20 +1148,23 @@ void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax) M_DrawCharacter (x + i*8, y, 129); M_DrawCharacter (x+i*8, y, 130); M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131); - sprintf(text, "%g", num); + if (fabs((int)num - num) < 0.01) + sprintf(text, "%i", (int)num); + else + sprintf(text, "%.2f", num); M_Print(x + (SLIDER_RANGE+2) * 8, y, text); } void M_DrawCheckbox (int x, int y, int on) { if (on) - M_Print (x, y, "on"); + M_Print(x, y, "on"); else - M_Print (x, y, "off"); + M_Print(x, y, "off"); } -#define OPTIONS_ITEMS 28 +#define OPTIONS_ITEMS 36 int options_cursor; @@ -1151,67 +1175,70 @@ void M_Menu_Options_f (void) m_entersound = true; } +extern cvar_t snd_staticvolume; extern cvar_t gl_delayfinish; extern cvar_t slowmo; extern dllhandle_t jpeg_dll; +extern cvar_t gl_texture_anisotropy; void M_Menu_Options_AdjustSliders (int dir) { + int optnum; S_LocalSound ("misc/menu3.wav"); - switch (options_cursor) - { - case 6: - Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1)); - break; - case 7: + optnum = 6; + if (options_cursor == optnum++) + Cvar_SetValueQuick (&vid_conwidth, bound(320, vid_conwidth.value + dir * 64, 2048)); + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&vid_conheight, bound(240, vid_conheight.value + dir * 48, 1536)); + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&scr_conspeed, bound(0, scr_conspeed.value + dir * 100, 1000)); + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&scr_conalpha, bound(0, scr_conalpha.value + dir * 0.2, 1)); + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&scr_conbrightness, bound(0, scr_conbrightness.value + dir * 0.2, 1)); + else if (options_cursor == optnum++) Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120)); - break; - case 8: - if (jpeg_dll != NULL) - Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer); - break; - case 9: + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer); + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1)); + else if (options_cursor == optnum++) Cvar_SetValueQuick (&r_sky, !r_sky.integer); - break; - case 10: - Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4)); - break; - case 11: + else if (options_cursor == optnum++) Cvar_SetValueQuick (&gl_combine, !gl_combine.integer); - break; - case 12: + else if (options_cursor == optnum++) Cvar_SetValueQuick (&gl_dither, !gl_dither.integer); - break; - case 13: + else if (options_cursor == optnum++) Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer); - break; - case 14: + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&gl_texture_anisotropy, bound(0, gl_texture_anisotropy.value + dir, 8)); + else if (options_cursor == optnum++) Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5)); - break; - case 15: // music volume - #ifdef _WIN32 + else if (options_cursor == optnum++) +#ifdef _WIN32 Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 1.0, 1)); - #else +#else Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1)); - #endif - break; - case 16: // sfx volume +#endif + else if (options_cursor == optnum++) Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1)); - break; - case 17: + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&snd_staticvolume, bound(0, snd_staticvolume.value + dir * 0.1, 1)); + else if (options_cursor == optnum++) Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5)); - break; - case 18: + else if (options_cursor == optnum++) Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5)); - break; - case 19: // static crosshair + else if (options_cursor == optnum++) Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer); - break; - case 20: // show framerate + else if (options_cursor == optnum++) Cvar_SetValueQuick (&showfps, !showfps.integer); - break; - case 21: // always run + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&showtime, !showtime.integer); + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&showdate, !showdate.integer); + else if (options_cursor == optnum++) + { if (cl_forwardspeed.value > 200) { Cvar_SetValueQuick (&cl_forwardspeed, 200); @@ -1222,31 +1249,63 @@ void M_Menu_Options_AdjustSliders (int dir) Cvar_SetValueQuick (&cl_forwardspeed, 400); Cvar_SetValueQuick (&cl_backspeed, 400); } - break; - case 22: // lookspring + } + else if (options_cursor == optnum++) Cvar_SetValueQuick (&lookspring, !lookspring.integer); - break; - case 23: // lookstrafe + else if (options_cursor == optnum++) Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer); - break; - case 24: // mouse speed + else if (options_cursor == optnum++) Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50)); - break; - case 25: // mouse look + else if (options_cursor == optnum++) Cvar_SetValueQuick (&freelook, !freelook.integer); - break; - case 26: // invert mouse + else if (options_cursor == optnum++) Cvar_SetValueQuick (&m_pitch, -m_pitch.value); - break; - case 27: // windowed mouse + else if (options_cursor == optnum++) Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer); - break; +} + +int optnum; +int opty; +int optcursor; + +void M_Options_PrintCommand(char *s, int enabled) +{ + if (opty >= 32) + { + DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); + M_ItemPrint(0, opty, s, enabled); + } + opty += 8; + optnum++; +} + +void M_Options_PrintCheckbox(char *s, int enabled, int yes) +{ + if (opty >= 32) + { + DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); + M_ItemPrint(0, opty, s, enabled); + M_DrawCheckbox(0 + strlen(s) * 8 + 8, opty, yes); } + opty += 8; + optnum++; +} + +void M_Options_PrintSlider(char *s, int enabled, float value, float minvalue, float maxvalue) +{ + if (opty >= 32) + { + DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); + M_ItemPrint(0, opty, s, enabled); + M_DrawSlider(0 + strlen(s) * 8 + 8, opty, value, minvalue, maxvalue); + } + opty += 8; + optnum++; } void M_Options_Draw (void) { - float y; + int visible; cachepic_t *p; M_Background(320, 240); @@ -1255,42 +1314,51 @@ void M_Options_Draw (void) p = Draw_CachePic("gfx/p_option.lmp"); M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); - y = 32; - M_Print(16, y, " Customize controls");y += 8; - M_Print(16, y, " Go to console");y += 8; - M_Print(16, y, " Reset to defaults");y += 8; - M_Print(16, y, " Video Options");y += 8; - M_Print(16, y, " Effects Options");y += 8; - M_Print(16, y, " Color Control Options");y += 8; - M_Print(16, y, " 2D Resolution");M_DrawSlider(220, y, scr_2dresolution.value, 0, 1);y += 8; - M_Print(16, y, " Screen size");M_DrawSlider(220, y, scr_viewsize.value, 30, 120);y += 8; - M_ItemPrint(16, y, " JPEG screenshots", jpeg_dll != NULL);M_DrawCheckbox(220, y, scr_screenshot_jpeg.integer);y += 8; - M_Print(16, y, " Sky");M_DrawCheckbox(220, y, r_sky.integer);y += 8; - M_Print(16, y, " Overbright Bits");M_DrawSlider(220, y, v_overbrightbits.value, 0, 4);y += 8; - M_Print(16, y, " Texture Combine");M_DrawCheckbox(220, y, gl_combine.integer);y += 8; - M_Print(16, y, " Dithering");M_DrawCheckbox(220, y, gl_dither.integer);y += 8; - M_Print(16, y, "Delay refresh (faster)");M_DrawCheckbox(220, y, gl_delayfinish.integer);y += 8; - M_ItemPrint(16, y, " Game Speed", sv.active);M_DrawSlider(220, y, slowmo.value, 0, 5);y += 8; - M_ItemPrint(16, y, " CD Music Volume", cdaudioinitialized);M_DrawSlider(220, y, bgmvolume.value, 0, 1);y += 8; - M_ItemPrint(16, y, " Sound Volume", snd_initialized);M_DrawSlider(220, y, volume.value, 0, 1);y += 8; - M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value, 0, 5);y += 8; - M_Print(16, y, " Crosshair Size");M_DrawSlider(220, y, crosshair_size.value, 1, 5);y += 8; - M_Print(16, y, " Static Crosshair");M_DrawCheckbox(220, y, crosshair_static.integer);y += 8; - M_Print(16, y, " Show Framerate");M_DrawCheckbox(220, y, showfps.integer);y += 8; - M_Print(16, y, " Always Run");M_DrawCheckbox(220, y, cl_forwardspeed.value > 200);y += 8; - M_Print(16, y, " Lookspring");M_DrawCheckbox(220, y, lookspring.integer);y += 8; - M_Print(16, y, " Lookstrafe");M_DrawCheckbox(220, y, lookstrafe.integer);y += 8; - M_Print(16, y, " Mouse Speed");M_DrawSlider(220, y, sensitivity.value, 1, 50);y += 8; - M_Print(16, y, " Mouse Look");M_DrawCheckbox(220, y, freelook.integer);y += 8; - M_Print(16, y, " Invert Mouse");M_DrawCheckbox(220, y, m_pitch.value < 0);y += 8; - M_Print(16, y, " Use Mouse");M_DrawCheckbox(220, y, vid_mouse.integer);y += 8; - - // cursor - M_DrawCharacter(200, 32 + options_cursor*8, 12+((int)(realtime*4)&1)); -} - - -void M_Options_Key (int k) + optnum = 0; + optcursor = options_cursor; + visible = (vid.conheight - 32) / 8; + opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8; + + M_Options_PrintCommand( "Customize controls", true); + M_Options_PrintCommand( " Go to console", true); + M_Options_PrintCommand( " Reset to defaults", true); + M_Options_PrintCommand( " Video", true); + M_Options_PrintCommand( " Effects", true); + M_Options_PrintCommand( " Color Control", true); + M_Options_PrintSlider( " 2D Screen Width ", true, vid_conwidth.value, 320, 2048); + M_Options_PrintSlider( " 2D Screen Height", true, vid_conheight.value, 240, 1536); + M_Options_PrintSlider( " Console Speed", true, scr_conspeed.value, 0, 1000); + M_Options_PrintSlider( " Console Alpha", true, scr_conalpha.value, 0, 1); + M_Options_PrintSlider( "Conback Brightness", true, scr_conbrightness.value, 0, 1); + M_Options_PrintSlider( " Screen size", true, scr_viewsize.value, 30, 120); + M_Options_PrintCheckbox(" JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer); + M_Options_PrintSlider( " JPEG quality", jpeg_dll != NULL, scr_screenshot_jpeg_quality.value, 0, 1); + M_Options_PrintCheckbox(" Sky", true, r_sky.integer); + M_Options_PrintCheckbox(" Texture Combine", true, gl_combine.integer); + M_Options_PrintCheckbox(" Dithering", true, gl_dither.integer); + M_Options_PrintCheckbox("Delay gfx (faster)", true, gl_delayfinish.integer); + M_Options_PrintSlider( "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.value, 0, 8); + M_Options_PrintSlider( " Game Speed", sv.active, slowmo.value, 0, 5); + M_Options_PrintSlider( " CD Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1); + M_Options_PrintSlider( " Sound Volume", snd_initialized.integer, volume.value, 0, 1); + M_Options_PrintSlider(gamemode == GAME_GOODVSBAD2 ? " Music Volume" : " Ambient Volume", snd_initialized.integer, snd_staticvolume.value, 0, 1); + M_Options_PrintSlider( " Crosshair", true, crosshair.value, 0, 5); + M_Options_PrintSlider( " Crosshair Size", true, crosshair_size.value, 1, 5); + M_Options_PrintCheckbox(" Static Crosshair", true, crosshair_static.integer); + M_Options_PrintCheckbox(" Show Framerate", true, showfps.integer); + M_Options_PrintCheckbox(" Show Time", true, showtime.integer); + M_Options_PrintCheckbox(" Show Date", true, showdate.integer); + M_Options_PrintCheckbox(" Always Run", true, cl_forwardspeed.value > 200); + M_Options_PrintCheckbox(" Lookspring", true, lookspring.integer); + M_Options_PrintCheckbox(" Lookstrafe", true, lookstrafe.integer); + M_Options_PrintSlider( " Mouse Speed", true, sensitivity.value, 1, 50); + M_Options_PrintCheckbox(" Mouse Look", true, freelook.integer); + M_Options_PrintCheckbox(" Invert Mouse", true, m_pitch.value < 0); + M_Options_PrintCheckbox(" Use Mouse", true, vid_mouse.integer); +} + + +void M_Options_Key (int k, char ascii) { switch (k) { @@ -1352,7 +1420,7 @@ void M_Options_Key (int k) } } -#define OPTIONS_EFFECTS_ITEMS 16 +#define OPTIONS_EFFECTS_ITEMS 22 int options_effects_cursor; @@ -1368,79 +1436,53 @@ extern cvar_t r_detailtextures; extern cvar_t cl_particles; extern cvar_t cl_explosions; extern cvar_t cl_stainmaps; +extern cvar_t cl_decals; 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_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_size; extern cvar_t cl_particles_blood_alpha; +extern cvar_t cl_particles_blood_bloodhack; void M_Menu_Options_Effects_AdjustSliders (int dir) { + int optnum; 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; - } + optnum = 0; + if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_explosions, !cl_explosions.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_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); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpmodels, !r_lerpmodels.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpsprites, !r_lerpsprites.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_wateralpha, bound(0, r_wateralpha.value + dir * 0.1, 1)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_watershader, bound(0, r_watershader.value + dir * 0.25, 10)); } void M_Options_Effects_Draw (void) { - float y; + int visible; cachepic_t *p; M_Background(320, 200); @@ -1449,30 +1491,37 @@ void M_Options_Effects_Draw (void) 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, 0, 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, 20);y += 8; - M_Print(16, y, " Blood Opacity");M_DrawSlider(220, y, cl_particles_blood_alpha.value, 0.2, 1);y += 8; - - // cursor - M_DrawCharacter(200, 32 + options_effects_cursor*8, 12+((int)(realtime*4)&1)); -} - - -void M_Options_Effects_Key (int k) + optcursor = options_effects_cursor; + optnum = 0; + visible = (vid.conheight - 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); + M_Options_PrintSlider( " Corona Intensity", true, r_coronas.value, 0, 4); + M_Options_PrintCheckbox(" Use Only Coronas", true, gl_flashblend.integer); + M_Options_PrintCheckbox(" Particles", true, cl_particles.integer); + M_Options_PrintSlider( " Particles Quality", true, cl_particles_quality.value, 1, 4); + M_Options_PrintCheckbox(" Explosions", true, cl_explosions.integer); + M_Options_PrintCheckbox(" Explosion Clipping", true, r_explosionclip.integer); + M_Options_PrintCheckbox(" Stainmaps", true, cl_stainmaps.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); + M_Options_PrintCheckbox(" Smoke", true, cl_particles_smoke.integer); + M_Options_PrintCheckbox(" Sparks", true, cl_particles_sparks.integer); + M_Options_PrintCheckbox(" Bubbles", true, cl_particles_bubbles.integer); + M_Options_PrintCheckbox(" Blood", true, cl_particles_blood.integer); + M_Options_PrintSlider( " Blood Opacity", true, cl_particles_blood_alpha.value, 0.2, 1); + M_Options_PrintCheckbox("Force New Blood Effect", true, cl_particles_blood_bloodhack.integer); + M_Options_PrintCheckbox(" Model Interpolation", true, r_lerpmodels.integer); + M_Options_PrintCheckbox(" Sprite Interpolation", true, r_lerpsprites.integer); + M_Options_PrintSlider( " Water Alpha (opacity)", true, r_wateralpha.value, 0, 1); + M_Options_PrintSlider( " Water Movement", true, r_waterscroll.value, 0, 10); + M_Options_PrintSlider( " GeForce3 Water Shader", true, r_watershader.value, 0, 10); +} + + +void M_Options_Effects_Key (int k, char ascii) { switch (k) { @@ -1529,92 +1578,107 @@ void M_Menu_Options_ColorControl_f (void) void M_Menu_Options_ColorControl_AdjustSliders (int dir) { + int optnum; float f; S_LocalSound ("misc/menu3.wav"); - switch (options_colorcontrol_cursor) - { - case 1: + optnum = 1; + if (options_colorcontrol_cursor == optnum++) Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer); - break; - case 2: + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 0); Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.125, 5)); - break; - case 3: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 0); Cvar_SetValueQuick (&v_contrast, bound(1, v_contrast.value + dir * 0.125, 5)); - break; - case 4: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 0); Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8)); - break; - case 5: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, !v_color_enable.integer); - break; - case 6: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); Cvar_SetValueQuick (&v_color_black_r, bound(0, v_color_black_r.value + dir * 0.0125, 0.8)); - break; - case 7: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); Cvar_SetValueQuick (&v_color_black_g, bound(0, v_color_black_g.value + dir * 0.0125, 0.8)); - break; - case 8: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); Cvar_SetValueQuick (&v_color_black_b, bound(0, v_color_black_b.value + dir * 0.0125, 0.8)); - break; - case 9: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); f = bound(0, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3 + dir * 0.0125, 0.8); Cvar_SetValueQuick (&v_color_black_r, f); Cvar_SetValueQuick (&v_color_black_g, f); Cvar_SetValueQuick (&v_color_black_b, f); - break; - case 10: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); Cvar_SetValueQuick (&v_color_grey_r, bound(0, v_color_grey_r.value + dir * 0.0125, 0.95)); - break; - case 11: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); Cvar_SetValueQuick (&v_color_grey_g, bound(0, v_color_grey_g.value + dir * 0.0125, 0.95)); - break; - case 12: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); Cvar_SetValueQuick (&v_color_grey_b, bound(0, v_color_grey_b.value + dir * 0.0125, 0.95)); - break; - case 13: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); f = bound(0, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3 + dir * 0.0125, 0.95); Cvar_SetValueQuick (&v_color_grey_r, f); Cvar_SetValueQuick (&v_color_grey_g, f); Cvar_SetValueQuick (&v_color_grey_b, f); - break; - case 14: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); Cvar_SetValueQuick (&v_color_white_r, bound(1, v_color_white_r.value + dir * 0.125, 5)); - break; - case 15: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); Cvar_SetValueQuick (&v_color_white_g, bound(1, v_color_white_g.value + dir * 0.125, 5)); - break; - case 16: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); Cvar_SetValueQuick (&v_color_white_b, bound(1, v_color_white_b.value + dir * 0.125, 5)); - break; - case 17: + } + else if (options_colorcontrol_cursor == optnum++) + { Cvar_SetValueQuick (&v_color_enable, 1); f = bound(1, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3 + dir * 0.125, 5); Cvar_SetValueQuick (&v_color_white_r, f); Cvar_SetValueQuick (&v_color_white_g, f); Cvar_SetValueQuick (&v_color_white_b, f); - break; } } void M_Options_ColorControl_Draw (void) { - float x, y, c, s, t, u, v; + int visible; + float x, c, s, t, u, v; cachepic_t *p; M_Background(320, 256); @@ -1623,73 +1687,74 @@ void M_Options_ColorControl_Draw (void) p = Draw_CachePic("gfx/p_option.lmp"); M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); - y = 32; - M_Print(16, y, " Reset to defaults");y += 8; - M_ItemPrint(16, y, "Hardware Gamma Control", vid_hardwaregammasupported);M_DrawCheckbox(220, y, v_hwgamma.integer);y += 8; - M_ItemPrint(16, y, " Gamma", !v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_gamma.value, 1, 5);y += 8; - M_ItemPrint(16, y, " Contrast", !v_color_enable.integer);M_DrawSlider(220, y, v_contrast.value, 1, 5);y += 8; - M_ItemPrint(16, y, " Brightness", !v_color_enable.integer);M_DrawSlider(220, y, v_brightness.value, 0, 0.8);y += 8; - M_Print(16, y, " Color Level Controls");M_DrawCheckbox(220, y, v_color_enable.integer);y += 8; - M_ItemPrint(16, y, " Black: Red ", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_r.value, 0, 0.8);y += 8; - M_ItemPrint(16, y, " Black: Green", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_g.value, 0, 0.8);y += 8; - M_ItemPrint(16, y, " Black: Blue ", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_b.value, 0, 0.8);y += 8; - M_ItemPrint(16, y, " Black: Grey ", v_color_enable.integer);M_DrawSlider(220, y, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3, 0, 0.8);y += 8; - M_ItemPrint(16, y, " Grey: Red ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_r.value, 0, 0.95);y += 8; - M_ItemPrint(16, y, " Grey: Green", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_g.value, 0, 0.95);y += 8; - M_ItemPrint(16, y, " Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_b.value, 0, 0.95);y += 8; - M_ItemPrint(16, y, " Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3, 0, 0.95);y += 8; - M_ItemPrint(16, y, " White: Red ", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_r.value, 1, 5);y += 8; - M_ItemPrint(16, y, " White: Green", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_g.value, 1, 5);y += 8; - M_ItemPrint(16, y, " White: Blue ", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_b.value, 1, 5);y += 8; - M_ItemPrint(16, y, " White: Grey ", v_color_enable.integer);M_DrawSlider(220, y, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3, 1, 5);y += 8; - - y += 4; - DrawQ_Fill(menu_x, menu_y + y, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);y += 4; + optcursor = options_colorcontrol_cursor; + optnum = 0; + visible = (vid.conheight - 32) / 8; + opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_COLORCONTROL_ITEMS - visible)) * 8; + + M_Options_PrintCommand( " Reset to defaults", true); + M_Options_PrintCheckbox("Hardware Gamma Control", vid_hardwaregammasupported.integer, v_hwgamma.integer); + M_Options_PrintSlider( " Gamma", !v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_gamma.value, 1, 5); + M_Options_PrintSlider( " Contrast", !v_color_enable.integer, v_contrast.value, 1, 5); + M_Options_PrintSlider( " Brightness", !v_color_enable.integer, v_brightness.value, 0, 0.8); + M_Options_PrintCheckbox(" Color Level Controls", true, v_color_enable.integer); + M_Options_PrintSlider( " Black: Red ", v_color_enable.integer, v_color_black_r.value, 0, 0.8); + M_Options_PrintSlider( " Black: Green", v_color_enable.integer, v_color_black_g.value, 0, 0.8); + M_Options_PrintSlider( " Black: Blue ", v_color_enable.integer, v_color_black_b.value, 0, 0.8); + M_Options_PrintSlider( " Black: Grey ", v_color_enable.integer, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3, 0, 0.8); + M_Options_PrintSlider( " Grey: Red ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_r.value, 0, 0.95); + M_Options_PrintSlider( " Grey: Green", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_g.value, 0, 0.95); + M_Options_PrintSlider( " Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_b.value, 0, 0.95); + M_Options_PrintSlider( " Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3, 0, 0.95); + M_Options_PrintSlider( " White: Red ", v_color_enable.integer, v_color_white_r.value, 1, 5); + M_Options_PrintSlider( " White: Green", v_color_enable.integer, v_color_white_g.value, 1, 5); + M_Options_PrintSlider( " White: Blue ", v_color_enable.integer, v_color_white_b.value, 1, 5); + M_Options_PrintSlider( " White: Grey ", v_color_enable.integer, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3, 1, 5); + + 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; - DrawQ_SuperPic(menu_x + 4, menu_y + y, "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);y += 4; - DrawQ_SuperPic(menu_x + 4, menu_y + y, 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);y += 4; - DrawQ_SuperPic(menu_x + 4, menu_y + y, "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);y += 4; - DrawQ_SuperPic(menu_x + 4, menu_y + y, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,1,0,1, 0,1, 0,0,0,1, 1,1, 0,1,0,1, 0);y += 4; - DrawQ_SuperPic(menu_x + 4, menu_y + y, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);y += 4; - DrawQ_SuperPic(menu_x + 4, menu_y + y, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,0,1,1, 0,1, 0,0,0,1, 1,1, 0,0,1,1, 0);y += 4; - DrawQ_SuperPic(menu_x + 4, menu_y + y, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);y += 4; - DrawQ_SuperPic(menu_x + 4, menu_y + y, 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);y += 4; + 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; + DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,1,0,1, 0,1, 0,0,0,1, 1,1, 0,1,0,1, 0);opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,0,1,1, 0,1, 0,0,0,1, 1,1, 0,0,1,1, 0);opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);opty += 4; + 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; u = s * 0.5; v = t * 0.5; - y += 8; + opty += 8; x = 4; - DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, c, 0, 0, 1, 0); - DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 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); - DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0); + DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, 0, 0, 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 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); + DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0); x += 80; - DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, 0, c, 0, 1, 0); - DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 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); - DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0); + DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, c, 0, 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 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); + DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0); x += 80; - DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, 0, 0, c, 1, 0); - DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0); - DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0); + DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, 0, c, 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0); + DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0); x += 80; - DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, c, c, c, 1, 0); - DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0); - DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0); - - // cursor - M_DrawCharacter(200, 32 + options_colorcontrol_cursor*8, 12+((int)(realtime*4)&1)); + DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, c, c, 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0); + DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0); } -void M_Options_ColorControl_Key (int k) +void M_Options_ColorControl_Key (int k, char ascii) { switch (k) { case K_ESCAPE: - M_Menu_Main_f (); + M_Menu_Options_f (); break; case K_ENTER: @@ -1711,7 +1776,6 @@ void M_Options_ColorControl_Key (int k) Cvar_SetValueQuick(&v_color_white_r, 1); Cvar_SetValueQuick(&v_color_white_g, 1); Cvar_SetValueQuick(&v_color_white_b, 1); - Cbuf_AddText ("exec default.cfg\n"); break; default: M_Menu_Options_ColorControl_AdjustSliders (1); @@ -1772,6 +1836,7 @@ char *quakebindnames[][2] = char *transfusionbindnames[][2] = { +{"", "Movement"}, // Movement commands {"+forward", "walk forward"}, {"+back", "backpedal"}, {"+left", "turn left"}, @@ -1780,30 +1845,63 @@ char *transfusionbindnames[][2] = {"+moveright", "step right"}, {"+jump", "jump / swim up"}, {"+movedown", "swim down"}, -{"+attack", "attack"}, -{"+button3", "altfire"}, +{"", "Combat"}, // Combat commands {"impulse 1", "Pitch Fork"}, {"impulse 2", "Flare Gun"}, {"impulse 3", "Shotgun"}, {"impulse 4", "Machine Gun"}, {"impulse 5", "Incinerator"}, -{"impulse 6", "Bombs"}, +{"impulse 6", "Bombs (TNT)"}, +{"impulse 35", "Proximity Bomb"}, +{"impulse 36", "Remote Detonator"}, {"impulse 7", "Aerosol Can"}, {"impulse 8", "Tesla Cannon"}, {"impulse 9", "Life Leech"}, -{"impulse 17", "Voodoo Doll"}, -{"impulse 11", "previous weapon"}, -{"impulse 10", "next weapon"}, -{"impulse 14", "previous item"}, -{"impulse 15", "next item"}, -{"impulse 13", "use item"}, -{"impulse 100", "add bot (red)"}, -{"impulse 101", "add bot (blue)"}, -{"impulse 102", "kick a bot"}, -{"impulse 50", "voting menu"}, -{"impulse 141", "identify player"}, -{"impulse 16", "next armor type"}, -{"impulse 20", "observer mode"} +{"impulse 10", "Voodoo Doll"}, +{"impulse 21", "next weapon"}, +{"impulse 22", "previous weapon"}, +{"+attack", "attack"}, +{"+button3", "altfire"}, +{"", "Inventory"}, // Inventory commands +{"impulse 40", "Dr.'s Bag"}, +{"impulse 41", "Crystal Ball"}, +{"impulse 42", "Beast Vision"}, +{"impulse 43", "Jump Boots"}, +{"impulse 23", "next item"}, +{"impulse 24", "previous item"}, +{"impulse 25", "use item"}, +{"", "Misc"}, // Misc commands +{"+button4", "use"}, +{"impulse 50", "add bot (red)"}, +{"impulse 51", "add bot (blue)"}, +{"impulse 52", "kick a bot"}, +{"impulse 26", "next armor type"}, +{"impulse 27", "identify player"}, +{"impulse 55", "voting menu"}, +{"impulse 56", "observer mode"} +}; + +char *goodvsbad2bindnames[][2] = +{ +{"impulse 69", "Power 1"}, +{"impulse 70", "Power 2"}, +{"impulse 71", "Power 3"}, +{"+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"}, +{"kill", "kill yourself"}, +{"+moveup", "swim up"}, +{"+movedown", "swim down"} }; int numcommands; @@ -1923,9 +2021,9 @@ void M_FindKeysForCommand (char *command, int *keys) count = 0; - for (j=0 ; j<256 ; j++) + for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++) { - b = keybindings[j]; + b = keybindings[0][j]; if (!b) continue; if (!strcmp (b, command) ) @@ -1942,13 +2040,13 @@ void M_UnbindCommand (char *command) int j; char *b; - for (j=0 ; j<256 ; j++) + for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++) { - b = keybindings[j]; + b = keybindings[0][j]; if (!b) continue; if (!strcmp (b, command)) - Key_SetBinding (j, ""); + Key_SetBinding (j, 0, ""); } } @@ -1961,22 +2059,30 @@ void M_Keys_Draw (void) cachepic_t *p; char keystring[1024]; - M_Background(320, 200); + M_Background(320, 48 + 8 * numcommands); p = Draw_CachePic ("gfx/ttl_cstm.lmp"); M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp"); if (bind_grab) - M_Print (12, 32, "Press a key or button for this action"); + M_Print(12, 32, "Press a key or button for this action"); else - M_Print (18, 32, "Enter to change, backspace to clear"); + M_Print(18, 32, "Enter to change, backspace to clear"); // search for known bindings for (i=0 ; i= numcommands) - keys_cursor = 0; + do + { + keys_cursor++; + if (keys_cursor >= numcommands) + keys_cursor = 0; + } + while (bindnames[keys_cursor][0][0] == '\0'); // skip sections break; case K_ENTER: // go into bind mode @@ -2069,20 +2183,22 @@ void M_Keys_Key (int k) //============================================================================= /* VIDEO MENU */ -#define VIDEO_ITEMS 5 +#define VIDEO_ITEMS 4 int video_cursor = 0; -int video_cursor_table[] = {56, 68, 80, 92, 116}; +int video_cursor_table[] = {56, 68, 80, 100}; // 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}}; +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}}; +// this is the number of the 640x480 mode in the list +#define VID_640 3 +#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; -extern int current_vid_stencil; void M_Menu_Video_f (void) @@ -2092,18 +2208,18 @@ void M_Menu_Video_f (void) m_entersound = true; // Look for the current resolution - for (video_resolution = 0; video_resolution < (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0])); video_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) break; } - // Default to 800x600 if we didn't find it - if (video_resolution == sizeof (video_resolutions) / sizeof (video_resolutions[0])) + // Default to VID_640 if we didn't find it + if (video_resolution == VID_RES_COUNT) { // may need to update this number if mode list changes - video_resolution = 4; + video_resolution = VID_640; Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]); Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]); } @@ -2124,22 +2240,18 @@ void M_Video_Draw (void) // 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); + 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"); + 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"); + M_Print(220, video_cursor_table[3], "Apply"); // Cursor M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1)); @@ -2156,10 +2268,10 @@ void M_Menu_Video_AdjustSliders (int dir) 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; + if (gamemode == GAME_FNIGGIUM ? new_resolution < VID_640 : new_resolution < 0) + video_resolution = VID_RES_COUNT - 1; + else if (new_resolution > VID_RES_COUNT - 1) + video_resolution = gamemode == GAME_FNIGGIUM ? VID_640 : 0; else video_resolution = new_resolution; @@ -2175,14 +2287,11 @@ void M_Menu_Video_AdjustSliders (int dir) 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) +void M_Video_Key (int key, char ascii) { switch (key) { @@ -2192,7 +2301,6 @@ void M_Video_Key (int key) 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 (); @@ -2202,7 +2310,7 @@ void M_Video_Key (int key) m_entersound = true; switch (video_cursor) { - case 4: + case 3: Cbuf_AddText ("vid_restart\n"); M_Menu_Options_f (); break; @@ -2259,7 +2367,7 @@ void M_Help_Draw (void) } -void M_Help_Key (int key) +void M_Help_Key (int key, char ascii) { switch (key) { @@ -2287,79 +2395,78 @@ void M_Help_Key (int key) //============================================================================= /* QUIT MENU */ -int msgNumber; +char *m_quit_message[9]; int m_quit_prevstate; qboolean wasInMenus; -char *quitMessage [] = + +int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8) { -/* .........1.........2.... */ -/* - " Are you gonna quit ", - " this game just like ", - " everything else? ", - " ", - - " Milord, methinks that ", - " thou art a lowly ", - " quitter. Is this true? ", - " ", - - " Do I need to bust your ", - " face open for trying ", - " to quit? ", - " ", - - " Man, I oughta smack you", - " for trying to quit! ", - " Press Y to get ", - " smacked out. ", - - " Press Y to quit like a ", - " big loser in life. ", - " Press N to stay proud ", - " and successful! ", - - " If you press Y to ", - " quit, I will summon ", - " Satan all over your ", - " hard drive! ", - - " Um, Asmodeus dislikes ", - " his children trying to ", - " quit. Press Y to return", - " to your Tinkertoys. ", - - " If you quit now, I'll ", - " throw a blanket-party ", - " for you next time! ", - " " - */ - -/* .........1.........2.... */ - " ", - " Tired of fragging ", - " already? ", - " ", - - " ", - " Quit now and forfeit ", - " your bodycount? ", - " ", - - " ", - " Are you sure you ", - " want to quit? ", - " ", - - " ", - " Off to do something ", - " constructive? ", - " ", + m_quit_message[0] = line1; + m_quit_message[1] = line2; + m_quit_message[2] = line3; + m_quit_message[3] = line4; + m_quit_message[4] = line5; + m_quit_message[5] = line6; + m_quit_message[6] = line7; + m_quit_message[7] = line8; + m_quit_message[8] = NULL; + return 1; +} + +int M_ChooseQuitMessage(int request) +{ + switch (gamemode) + { + case GAME_NORMAL: + case GAME_HIPNOTIC: + case GAME_ROGUE: + case GAME_NEHAHRA: + if (request-- == 0) return M_QuitMessage("Are you gonna quit","this game just like","everything else?",NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Milord, methinks that","thou art a lowly","quitter. Is this true?",NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Do I need to bust your","face open for trying","to quit?",NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Man, I oughta smack you","for trying to quit!","Press Y to get","smacked out.",NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Press Y to quit like a","big loser in life.","Press N to stay proud","and successful!",NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("If you press Y to","quit, I will summon","Satan all over your","hard drive!",NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Um, Asmodeus dislikes","his children trying to","quit. Press Y to return","to your Tinkertoys.",NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("If you quit now, I'll","throw a blanket-party","for you next time!",NULL,NULL,NULL,NULL,NULL); + break; + case GAME_GOODVSBAD2: + if (request-- == 0) return M_QuitMessage("Press Yes To Quit","...","Yes",NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Do you really want to","Quit?","Play Good vs bad 3!",NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("All your quit are","belong to long duck","dong",NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Press Y to quit","","But are you too legit?",NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("This game was made by","e@chip-web.com","It is by far the best","game ever made.",NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Even I really dont","know of a game better","Press Y to quit","like rougue chedder",NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("After you stop playing","tell the guys who made","counterstrike to just","kill themselves now",NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Press Y to exit to DOS","","SSH login as user Y","to exit to Linux",NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Press Y like you","were waanderers","from Ys'",NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("This game was made in","Nippon like the SS","announcer's saying ipon",NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("you","want to quit?",NULL,NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Please stop playing","this stupid game",NULL,NULL,NULL,NULL,NULL,NULL); + break; + case GAME_BATTLEMECH: + if (request-- == 0) return M_QuitMessage("? WHY ?","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Leave now and your mech is scrap!","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Accept Defeat?","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Wait! There are more mechs to destroy!","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Where's your bloodlust?","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Your mech here is way more impressive","than your car out there...","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Quitting won't reduce your debt","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL); + break; + default: + if (request-- == 0) return M_QuitMessage("Tired of fragging already?",NULL,NULL,NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Quit now and forfeit your bodycount?",NULL,NULL,NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Are you sure you want to quit?",NULL,NULL,NULL,NULL,NULL,NULL,NULL); + if (request-- == 0) return M_QuitMessage("Off to do something constructive?",NULL,NULL,NULL,NULL,NULL,NULL,NULL); + break; + } + return 0; }; void M_Menu_Quit_f (void) { + int n; if (m_state == m_quit) return; wasInMenus = (key_dest == key_menu); @@ -2367,11 +2474,14 @@ void M_Menu_Quit_f (void) m_quit_prevstate = m_state; m_state = m_quit; m_entersound = true; - msgNumber = rand()&3; //&7; + // count how many there are + for (n = 0;M_ChooseQuitMessage(n);n++); + // choose one + M_ChooseQuitMessage(rand() % n); } -void M_Quit_Key (int key) +void M_Quit_Key (int key, char ascii) { switch (key) { @@ -2398,18 +2508,28 @@ void M_Quit_Key (int key) default: break; } - } - void M_Quit_Draw (void) { - M_Background(208, 48); - M_DrawTextBox(0, 0, 24, 4); - M_Print(8, 8, quitMessage[msgNumber*4+0]); - M_Print(8, 16, quitMessage[msgNumber*4+1]); - M_Print(8, 24, quitMessage[msgNumber*4+2]); - M_Print(8, 32, quitMessage[msgNumber*4+3]); + int i, l, linelength, firstline, lastline, lines; + for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_quit_message[i];i++) + { + if ((l = strlen(m_quit_message[i]))) + { + if (firstline > i) + firstline = i; + if (lastline < i) + lastline = i; + if (linelength < l) + linelength = l; + } + } + lines = (lastline - firstline) + 1; + M_Background(linelength * 8 + 16, lines * 8 + 16); + M_DrawTextBox(0, 0, linelength, lines); + for (i = 0, l = firstline;i < lines;i++, l++) + M_Print(8 + 4 * (linelength - strlen(m_quit_message[l])), 8 + 8 * i, m_quit_message[l]); } //============================================================================= @@ -2461,24 +2581,24 @@ void M_LanConfig_Draw (void) else startJoin = "Join Game"; protocol = "TCP/IP"; - M_Print (basex, 32, va ("%s - %s", startJoin, protocol)); + M_Print(basex, 32, va ("%s - %s", startJoin, protocol)); basex += 8; - M_Print (basex, lanConfig_cursor_table[0], "Port"); + M_Print(basex, lanConfig_cursor_table[0], "Port"); M_DrawTextBox (basex+8*8, lanConfig_cursor_table[0]-8, 6, 1); - M_Print (basex+9*8, lanConfig_cursor_table[0], lanConfig_portname); + M_Print(basex+9*8, lanConfig_cursor_table[0], lanConfig_portname); if (JoiningGame) { - M_Print (basex, lanConfig_cursor_table[1], "Search for games..."); - M_Print (basex, lanConfig_cursor_table[2]-16, "Join game at:"); + M_Print(basex, lanConfig_cursor_table[1], "Search for games..."); + M_Print(basex, lanConfig_cursor_table[2]-16, "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+16, lanConfig_cursor_table[2], lanConfig_joinname); } else { M_DrawTextBox (basex, lanConfig_cursor_table[1]-8, 2, 1); - M_Print (basex+8, lanConfig_cursor_table[1], "OK"); + M_Print(basex+8, lanConfig_cursor_table[1], "OK"); } M_DrawCharacter (basex-8, lanConfig_cursor_table [lanConfig_cursor], 12+((int)(realtime*4)&1)); @@ -2490,11 +2610,11 @@ void M_LanConfig_Draw (void) M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [2], 10+((int)(realtime*4)&1)); if (*m_return_reason) - M_PrintWhite (basex, 168, m_return_reason); + M_Print(basex, 168, m_return_reason); } -void M_LanConfig_Key (int key) +void M_LanConfig_Key (int key, char ascii) { int l; @@ -2558,7 +2678,7 @@ void M_LanConfig_Key (int key) break; default: - if (key < 32 || key > 127) + if (ascii < 32 || ascii > 126) break; if (lanConfig_cursor == 2) @@ -2567,11 +2687,11 @@ void M_LanConfig_Key (int key) if (l < 21) { lanConfig_joinname[l+1] = 0; - lanConfig_joinname[l] = key; + lanConfig_joinname[l] = ascii; } } - if (key < '0' || key > '9') + if (ascii < '0' || ascii > '9') break; if (lanConfig_cursor == 0) { @@ -2579,7 +2699,7 @@ void M_LanConfig_Key (int key) if (l < 5) { lanConfig_portname[l+1] = 0; - lanConfig_portname[l] = key; + lanConfig_portname[l] = ascii; } } } @@ -2682,7 +2802,7 @@ episode_t quakeepisodes[] = {"Deathmatch Arena", 32, 6} }; -//MED 01/06/97 added hipnotic levels + //MED 01/06/97 added hipnotic levels level_t hipnoticlevels[] = { {"start", "Command HQ"}, // 0 @@ -2802,6 +2922,8 @@ level_t transfusionlevels[] = {"e1m7", "Altar of Stone"}, {"e2m8", "The Lair of Shial"}, {"e3m7", "The Pit of Cerberus"}, + {"e4m1", "Butchery Loves Company"}, + {"e4m7", "In the Flesh"}, {"e4m8", "The Hall of the Epiphany"}, {"e4m9", "Mall of the Dead"}, @@ -2810,6 +2932,7 @@ level_t transfusionlevels[] = {"dm3", "Area 15"}, {"e6m1", "Welcome to Your Life"}, {"e6m8", "Beauty and the Beast"}, + {"e6m9", "Forgotten Catacombs"}, {"cpbb01", "Crypt of Despair"}, {"cpbb03", "Unholy Cathedral"}, @@ -2821,6 +2944,8 @@ level_t transfusionlevels[] = {"crypt", "The Crypt"}, {"bb3_2k1", "Bodies Infusion"}, + {"captasao", "Captasao"}, + {"curandero", "Curandero"}, {"dcamp", "DeathCamp"}, {"highnoon", "HighNoon"}, {"qbb1", "The Confluence"}, @@ -2831,18 +2956,53 @@ level_t transfusionlevels[] = {"fragm", "Frag'M"}, {"maim", "Maim"}, {"qe1m7", "The House of Chthon"}, + {"qmorbias", "Dm-Morbias"}, {"simple", "Dead Simple"} }; episode_t transfusionepisodes[] = { {"Blood", 0, 8}, - {"Blood Single Player", 8, 7}, - {"Plasma Pack", 15, 5}, - {"Cryptic Passage", 20, 2}, - {"Blood 2", 22, 5}, - {"Transfusion", 27, 6}, - {"Conversions", 33, 5} + {"Blood Single Player", 8, 9}, + {"Plasma Pack", 17, 6}, + {"Cryptic Passage", 23, 2}, + {"Blood 2", 25, 5}, + {"Transfusion", 30, 8}, + {"Conversions", 38, 6} +}; + +level_t goodvsbad2levels[] = +{ + {"rts", "Many Paths"}, // 0 + {"chess", "Chess, Scott Hess"}, // 1 + {"dot", "Big Wall"}, + {"city2", "The Big City"}, + {"bwall", "0 G like Psychic TV"}, + {"snow", "Wireframed"}, + {"telep", "Infinite Falling"}, + {"faces", "Facing Bases"}, + {"island", "Adventure Islands"}, +}; + +episode_t goodvsbad2episodes[] = +{ + {"Levels? Bevels!", 0, 8}, +}; + +level_t battlemechlevels[] = +{ + {"start", "Parking Level"}, + {"dm1", "Hot Dump"}, // 1 + {"dm2", "The Pits"}, + {"dm3", "Dimber Died"}, + {"dm4", "Fire in the Hole"}, + {"dm5", "Clubhouses"}, + {"dm6", "Army go Underground"}, +}; + +episode_t battlemechepisodes[] = +{ + {"Time for Battle", 0, 7}, }; gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2}; @@ -2851,6 +3011,8 @@ gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepiso 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 goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1}; +gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1}; typedef struct { @@ -2867,6 +3029,8 @@ gameinfo_t gamelist[] = {GAME_ROGUE, &roguegame, &roguegame}, {GAME_NEHAHRA, &nehahragame, &nehahragame}, {GAME_TRANSFUSION, &transfusiongame, &transfusiongame}, + {GAME_GOODVSBAD2, &goodvsbad2game, &goodvsbad2game}, + {GAME_BATTLEMECH, &battlemechgame, &battlemechgame}, {-1, &sharewarequakegame, ®isteredquakegame} // final fallback }; @@ -2896,12 +3060,12 @@ void M_Menu_GameOptions_f (void) if (maxplayers == 0) maxplayers = svs.maxclients; if (maxplayers < 2) - maxplayers = MAX_SCOREBOARD; + maxplayers = min(8, MAX_SCOREBOARD); } -int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 120, 128}; -#define NUM_GAMEOPTIONS 10 +int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 132, 152, 160}; +#define NUM_GAMEOPTIONS 11 int gameoptions_cursor; void M_GameOptions_Draw (void) @@ -2917,109 +3081,119 @@ void M_GameOptions_Draw (void) M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); M_DrawTextBox (152, 32, 10, 1); - M_Print (160, 40, "begin game"); + M_Print(160, 40, "begin game"); - M_Print (0, 56, " Max players"); - M_Print (160, 56, va("%i", maxplayers) ); + M_Print(0, 56, " Max players"); + M_Print(160, 56, va("%i", maxplayers) ); - M_Print (0, 64, " Game Type"); - if (gamemode == GAME_TRANSFUSION) - { - if (!deathmatch.integer) - Cvar_SetValue("deathmatch", 1); - if (deathmatch.integer == 2) - M_Print (160, 64, "Capture the Flag"); - else - M_Print (160, 64, "Blood Bath"); - } - else + if (gamemode != GAME_GOODVSBAD2) { - if (!coop.integer && !deathmatch.integer) - Cvar_SetValue("deathmatch", 1); - if (coop.integer) - M_Print (160, 64, "Cooperative"); + M_Print(0, 64, " Game Type"); + if (gamemode == GAME_TRANSFUSION) + { + if (!deathmatch.integer) + Cvar_SetValue("deathmatch", 1); + if (deathmatch.integer == 2) + M_Print(160, 64, "Capture the Flag"); + else + M_Print(160, 64, "Blood Bath"); + } + else if (gamemode == GAME_BATTLEMECH) + { + if (!deathmatch.integer) + Cvar_SetValue("deathmatch", 1); + if (deathmatch.integer == 2) + M_Print(160, 64, "Rambo Match"); + else + M_Print(160, 64, "Deathmatch"); + } else - M_Print (160, 64, "Deathmatch"); - } - - M_Print (0, 72, " Teamplay"); - if (gamemode == GAME_ROGUE) - { - char *msg; - - switch((int)teamplay.integer) { - case 1: msg = "No Friendly Fire"; break; - case 2: msg = "Friendly Fire"; break; - case 3: msg = "Tag"; break; - case 4: msg = "Capture the Flag"; break; - case 5: msg = "One Flag CTF"; break; - case 6: msg = "Three Team CTF"; break; - default: msg = "Off"; break; + if (!coop.integer && !deathmatch.integer) + Cvar_SetValue("deathmatch", 1); + if (coop.integer) + M_Print(160, 64, "Cooperative"); + else + M_Print(160, 64, "Deathmatch"); } - M_Print (160, 72, msg); - } - else if (gamemode == GAME_TRANSFUSION) - { - char *msg; - switch (teamplay.integer) + M_Print(0, 72, " Teamplay"); + if (gamemode == GAME_ROGUE) { - case 0: msg = "Off"; break; - case 2: msg = "Friendly Fire"; break; - default: msg = "No Friendly Fire"; break; - } - M_Print (160, 72, msg); - } - else - { - char *msg; + char *msg; - switch((int)teamplay.integer) + switch((int)teamplay.integer) + { + case 1: msg = "No Friendly Fire"; break; + case 2: msg = "Friendly Fire"; break; + case 3: msg = "Tag"; break; + case 4: msg = "Capture the Flag"; break; + case 5: msg = "One Flag CTF"; break; + case 6: msg = "Three Team CTF"; break; + default: msg = "Off"; break; + } + M_Print(160, 72, msg); + } + else { - case 1: msg = "No Friendly Fire"; break; - case 2: msg = "Friendly Fire"; break; - default: msg = "Off"; break; + char *msg; + + switch (teamplay.integer) + { + case 0: msg = "Off"; break; + case 2: msg = "Friendly Fire"; break; + default: msg = "No Friendly Fire"; break; + } + M_Print(160, 72, msg); } - 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"); - else - M_Print (160, 80, "Nightmare difficulty"); + 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"); + else + M_Print(160, 80, "Nightmare difficulty"); - M_Print (0, 88, " Frag Limit"); - if (fraglimit.integer == 0) - M_Print (160, 88, "none"); - else - M_Print (160, 88, va("%i frags", fraglimit.integer)); + M_Print(0, 88, " Frag Limit"); + if (fraglimit.integer == 0) + M_Print(160, 88, "none"); + else + M_Print(160, 88, va("%i frags", fraglimit.integer)); - M_Print (0, 96, " Time Limit"); - if (timelimit.integer == 0) - M_Print (160, 96, "none"); - else - M_Print (160, 96, va("%i minutes", timelimit.integer)); + M_Print(0, 96, " Time Limit"); + if (timelimit.integer == 0) + M_Print(160, 96, "none"); + else + M_Print(160, 96, va("%i minutes", timelimit.integer)); + } + + M_Print(0, 104, " Public server"); + M_Print(160, 104, (sv_public.integer == 0) ? "no" : "yes"); - M_Print (0, 104, " Public server"); - M_Print (160, 104, (sv_public.integer == 0) ? "no" : "yes"); + M_Print(0, 120, " Server name"); + M_DrawTextBox (0, 124, 38, 1); + M_Print(8, 132, hostname.string); g = lookupgameinfo(); - M_Print (0, 120, " Episode"); - M_Print (160, 120, g->episodes[startepisode].description); + if (gamemode != GAME_GOODVSBAD2) + { + M_Print(0, 152, " Episode"); + M_Print(160, 152, g->episodes[startepisode].description); + } - M_Print (0, 128, " Level"); - M_Print (160, 128, g->levels[g->episodes[startepisode].firstLevel + startlevel].description); - M_Print (160, 136, g->levels[g->episodes[startepisode].firstLevel + startlevel].name); + M_Print(0, 160, " Level"); + M_Print(160, 160, g->levels[g->episodes[startepisode].firstLevel + startlevel].description); + M_Print(160, 168, g->levels[g->episodes[startepisode].firstLevel + startlevel].name); // line cursor - M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1)); + if (gameoptions_cursor == 8) + M_DrawCharacter (8 + 8 * strlen(hostname.string), gameoptions_cursor_table[gameoptions_cursor], 10+((int)(realtime*4)&1)); + else + M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1)); if (m_serverInfoMessage) { @@ -3028,15 +3202,13 @@ void M_GameOptions_Draw (void) x = (320-26*8)/2; M_DrawTextBox (x, 138, 24, 4); x += 8; - 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@telefragged.com "); + 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@telefragged.com "); } else - { m_serverInfoMessage = false; - } } } @@ -3061,6 +3233,8 @@ void M_NetStart_Change (int dir) break; case 2: + if (gamemode == GAME_GOODVSBAD2) + break; if (gamemode == GAME_TRANSFUSION) { if (deathmatch.integer == 2) // changing from CTF to BloodBath @@ -3068,6 +3242,13 @@ void M_NetStart_Change (int dir) else // changing from BloodBath to CTF Cvar_SetValueQuick (&deathmatch, 2); } + else if (gamemode == GAME_BATTLEMECH) + { + if (deathmatch.integer == 2) // changing from Rambo to Deathmatch + Cvar_SetValueQuick (&deathmatch, 0); + else // changing from Deathmatch to Rambo + Cvar_SetValueQuick (&deathmatch, 2); + } else { if (deathmatch.integer) // changing from deathmatch to coop @@ -3084,6 +3265,8 @@ void M_NetStart_Change (int dir) break; case 3: + if (gamemode == GAME_GOODVSBAD2) + break; if (gamemode == GAME_ROGUE) count = 6; else @@ -3097,6 +3280,8 @@ void M_NetStart_Change (int dir) break; case 4: + if (gamemode == GAME_GOODVSBAD2) + break; Cvar_SetValueQuick (&skill, skill.integer + dir); if (skill.integer > 3) Cvar_SetValueQuick (&skill, 0); @@ -3105,6 +3290,8 @@ void M_NetStart_Change (int dir) break; case 5: + if (gamemode == GAME_GOODVSBAD2) + break; Cvar_SetValueQuick (&fraglimit, fraglimit.integer + dir*10); if (fraglimit.integer > 100) Cvar_SetValueQuick (&fraglimit, 0); @@ -3113,6 +3300,8 @@ void M_NetStart_Change (int dir) break; case 6: + if (gamemode == GAME_GOODVSBAD2) + break; Cvar_SetValueQuick (&timelimit, timelimit.value + dir*5); if (timelimit.value > 60) Cvar_SetValueQuick (&timelimit, 0); @@ -3125,6 +3314,11 @@ void M_NetStart_Change (int dir) break; case 8: + break; + + case 9: + if (gamemode == GAME_GOODVSBAD2) + break; startepisode += dir; g = lookupgameinfo(); @@ -3137,7 +3331,7 @@ void M_NetStart_Change (int dir) startlevel = 0; break; - case 9: + case 10: startlevel += dir; g = lookupgameinfo(); @@ -3150,9 +3344,11 @@ void M_NetStart_Change (int dir) } } -void M_GameOptions_Key (int key) +void M_GameOptions_Key (int key, char ascii) { gamelevels_t *g; + int l; + char hostnamebuf[128]; switch (key) { @@ -3203,6 +3399,35 @@ void M_GameOptions_Key (int key) M_NetStart_Change (1); break; + + case K_BACKSPACE: + if (gameoptions_cursor == 8) + { + l = strlen(hostname.string); + if (l) + { + l = min(l - 1, 37); + memcpy(hostnamebuf, hostname.string, l); + hostnamebuf[l] = 0; + Cvar_Set("hostname", hostnamebuf); + } + } + break; + + default: + if (ascii < 32 || ascii > 126) + break; + if (gameoptions_cursor == 8) + { + l = strlen(hostname.string); + if (l < 37) + { + memcpy(hostnamebuf, hostname.string, l); + hostnamebuf[l] = ascii; + hostnamebuf[l+1] = 0; + Cvar_Set("hostname", hostnamebuf); + } + } } } @@ -3226,30 +3451,42 @@ void M_ServerList_Draw (void) { int n, y, visible, start, end; cachepic_t *p; + const char *s; // use as much vertical space as available M_Background(640, vid.conheight); // scroll the list as the cursor moves - visible = (vid.conheight - 16 - 32) / 8; + 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); + y = 48; + visible = (vid.conheight - 16 - y) / 8; start = bound(0, slist_cursor - (visible >> 1), hostCacheCount - visible); end = min(start + visible, hostCacheCount); p = Draw_CachePic("gfx/p_multi.lmp"); M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi.lmp"); - y = 32; - for (n = start;n < end;n++) + if (end > start) { - M_Print(0, y, hostcache[n].line1);y += 8; - M_Print(0, y, hostcache[n].line2);y += 8; + 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; + } + } + else if (realtime - masterquerytime < 3) + { + if (masterquerycount) + M_Print(0, y, "No servers found"); + else + M_Print(0, y, "No master servers found (network problem?)"); } - M_DrawCharacter(0, 32 + (slist_cursor - start) * 16, 12+((int)(realtime*4)&1)); - - if (*m_return_reason) - M_PrintWhite(16, vid.conheight - 8, m_return_reason); } -void M_ServerList_Key(int k) +void M_ServerList_Key(int k, char ascii) { switch (k) { @@ -3291,10 +3528,16 @@ void M_ServerList_Key(int k) //============================================================================= /* Menu Subsystem */ +void M_Keydown(int key, char ascii); +void M_Draw(void); +void M_ToggleMenu_f(void); +void M_Shutdown(void); void M_Init (void) { - Cmd_AddCommand ("togglemenu", M_ToggleMenu_f); + menu_mempool = Mem_AllocPool("Menu"); + menuplyr_load = true; + menuplyr_pixels = NULL; Cmd_AddCommand ("menu_main", M_Menu_Main_f); Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f); @@ -3316,24 +3559,41 @@ void M_Init (void) numcommands = sizeof(transfusionbindnames) / sizeof(transfusionbindnames[0]); bindnames = transfusionbindnames; } + else if (gamemode == GAME_GOODVSBAD2) + { + numcommands = sizeof(goodvsbad2bindnames) / sizeof(goodvsbad2bindnames[0]); + bindnames = goodvsbad2bindnames; + } else { numcommands = sizeof(quakebindnames) / sizeof(quakebindnames[0]); bindnames = quakebindnames; } + // Make sure "keys_cursor" doesn't start on a section in the binding list + keys_cursor = 0; + while (bindnames[keys_cursor][0][0] == '\0') + { + keys_cursor++; + + // Only sections? There may be a problem somewhere... + if (keys_cursor >= numcommands) + Sys_Error ("M_Init: The key binding list only contains sections"); + } + + if (gamemode == GAME_NEHAHRA) { if (FS_FileExists("maps/neh1m4.bsp")) { if (FS_FileExists("hearing.dem")) { - Con_Printf("Nehahra movie and game detected.\n"); + Con_Print("Nehahra movie and game detected.\n"); NehGameType = TYPE_BOTH; } else { - Con_Printf("Nehahra game detected.\n"); + Con_Print("Nehahra game detected.\n"); NehGameType = TYPE_GAME; } } @@ -3341,12 +3601,12 @@ void M_Init (void) { if (FS_FileExists("hearing.dem")) { - Con_Printf("Nehahra movie detected.\n"); + Con_Print("Nehahra movie detected.\n"); NehGameType = TYPE_DEMO; } else { - Con_Printf("Nehahra not found.\n"); + Con_Print("Nehahra not found.\n"); NehGameType = TYPE_GAME; // could just complain, but... } } @@ -3357,6 +3617,7 @@ void M_Draw (void) { if (key_dest != key_menu) m_state = m_none; + if (m_state == m_none) return; @@ -3444,7 +3705,7 @@ void M_Draw (void) } -void M_Keydown (int key) +void M_Keydown (int key, char ascii) { switch (m_state) { @@ -3452,72 +3713,302 @@ void M_Keydown (int key) return; case m_main: - M_Main_Key (key); + M_Main_Key (key, ascii); return; case m_demo: - M_Demo_Key (key); + M_Demo_Key (key, ascii); return; case m_singleplayer: - M_SinglePlayer_Key (key); + M_SinglePlayer_Key (key, ascii); return; case m_load: - M_Load_Key (key); + M_Load_Key (key, ascii); return; case m_save: - M_Save_Key (key); + M_Save_Key (key, ascii); return; case m_multiplayer: - M_MultiPlayer_Key (key); + M_MultiPlayer_Key (key, ascii); return; case m_setup: - M_Setup_Key (key); + M_Setup_Key (key, ascii); return; case m_options: - M_Options_Key (key); + M_Options_Key (key, ascii); return; case m_options_effects: - M_Options_Effects_Key (key); + M_Options_Effects_Key (key, ascii); return; case m_options_colorcontrol: - M_Options_ColorControl_Key (key); + M_Options_ColorControl_Key (key, ascii); return; case m_keys: - M_Keys_Key (key); + M_Keys_Key (key, ascii); return; case m_video: - M_Video_Key (key); + M_Video_Key (key, ascii); return; case m_help: - M_Help_Key (key); + M_Help_Key (key, ascii); return; case m_quit: - M_Quit_Key (key); + M_Quit_Key (key, ascii); return; case m_lanconfig: - M_LanConfig_Key (key); + M_LanConfig_Key (key, ascii); return; case m_gameoptions: - M_GameOptions_Key (key); + M_GameOptions_Key (key, ascii); return; case m_slist: - M_ServerList_Key (key); + M_ServerList_Key (key, ascii); return; } } +void M_Shutdown(void) +{ + // reset key_dest + key_dest = key_game; +} + +void M_Restart(void) +{ +} + +//============================================================================ +// Menu prog handling +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" +#define M_F_TOGGLE "m_toggle" +#define M_F_SHUTDOWN "m_shutdown" + +static char *m_required_func[] = { +M_F_INIT, +M_F_KEYDOWN, +M_F_DRAW, +M_F_TOGGLE, +M_F_SHUTDOWN, +}; + +static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*); + +static func_t m_draw,m_keydown; + +void MR_SetRouting (qboolean forceold); + +void MP_Error(void) +{ + // fall back to the normal menu + + // say it + Con_Print("Falling back to normal menu\n"); + + key_dest = key_game; + + //PRVM_ResetProg(); + + // init the normal menu now -> this will also correct the menu router pointers + MR_SetRouting (TRUE); +} + +void MP_Keydown (int key, char ascii) +{ + PRVM_Begin; + PRVM_SetProg(PRVM_MENUPROG); + + // set time + *prog->time = realtime; + + // pass key + prog->globals[OFS_PARM0] = (float) key; + prog->globals[OFS_PARM1] = (float) ascii; + PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key, float ascii) required\n"); + + PRVM_End; +} + +void MP_Draw (void) +{ + PRVM_Begin; + PRVM_SetProg(PRVM_MENUPROG); + + // set time + *prog->time = realtime; + + PRVM_ExecuteProgram(m_draw,""); + + PRVM_End; +} + +void MP_ToggleMenu_f (void) +{ + PRVM_Begin; + PRVM_SetProg(PRVM_MENUPROG); + + // set time + *prog->time = realtime; + + PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_TOGGLE) - prog->functions),""); + + PRVM_End; +} + +void MP_Shutdown (void) +{ + PRVM_Begin; + PRVM_SetProg(PRVM_MENUPROG); + + // set time + *prog->time = realtime; + + PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_SHUTDOWN) - prog->functions),""); + + // reset key_dest + key_dest = key_game; + + // AK not using this cause Im not sure whether this is useful at all instead : + PRVM_ResetProg(); + + PRVM_End; +} + +void MP_Init (void) +{ + PRVM_Begin; + PRVM_InitProg(PRVM_MENUPROG); + + prog->crc = M_PROGHEADER_CRC; + prog->edictprivate_size = 0; // no private struct used + prog->name = M_NAME; + prog->limit_edicts = M_MAX_EDICTS; + prog->extensionstring = vm_m_extensions; + prog->builtins = vm_m_builtins; + prog->numbuiltins = vm_m_numbuiltins; + prog->init_cmd = VM_M_Cmd_Init; + prog->reset_cmd = VM_M_Cmd_Reset; + prog->error_cmd = MP_Error; + + // allocate the mempools + prog->edicts_mempool = Mem_AllocPool(M_NAME " edicts mempool"); + prog->edictstring_mempool = Mem_AllocPool( M_NAME " edict string mempool"); + prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME); + + PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func); + + // set m_draw and m_keydown + m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions); + m_keydown = (func_t) (PRVM_ED_FindFunction(M_F_KEYDOWN) - prog->functions); + + // set time + *prog->time = realtime; + + // call the prog init + PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_INIT) - prog->functions),""); + + PRVM_End; +} + +void MP_Restart(void) +{ + + MP_Init(); +} + +//============================================================================ +// Menu router + +static cvar_t forceqmenu = { 0, "forceqmenu", "0" }; + +void MR_SetRouting(qboolean forceold) +{ + static qboolean m_init = FALSE, mp_init = FALSE; + + // if the menu prog isnt available or forceqmenu ist set, use the old menu + if(!FS_FileExists(M_PROG_FILENAME) || forceqmenu.integer || forceold) + { + // set menu router function pointers + MR_Keydown = M_Keydown; + MR_Draw = M_Draw; + MR_ToggleMenu_f = M_ToggleMenu_f; + MR_Shutdown = M_Shutdown; + + // init + if(!m_init) + { + M_Init(); + m_init = TRUE; + } + else + M_Restart(); + } + else + { + // set menu router function pointers + MR_Keydown = MP_Keydown; + MR_Draw = MP_Draw; + MR_ToggleMenu_f = MP_ToggleMenu_f; + MR_Shutdown = MP_Shutdown; + + if(!mp_init) + { + MP_Init(); + mp_init = TRUE; + } + else + MP_Restart(); + } +} + +void MR_Restart(void) +{ + MR_Shutdown (); + MR_SetRouting (FALSE); +} + +void Call_MR_ToggleMenu_f(void) +{ + if(MR_ToggleMenu_f) + MR_ToggleMenu_f(); +} + +void MR_Init() +{ + // set router console commands + Cvar_RegisterVariable (&forceqmenu); + Cmd_AddCommand ("menu_restart",MR_Restart); + Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f); + + // use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1) + if(COM_CheckParm("-forceqmenu")) + Cvar_SetValueQuick(&forceqmenu,1); + // use -useqmenu for debugging proposes, cause it starts + // the normal quake menu only the first time + else if(COM_CheckParm("-useqmenu")) + MR_SetRouting (TRUE); + else + MR_SetRouting (FALSE); +} + + + +