X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=4c603d21326d566c4728231b5ec83a0badff3937;hb=f58d94957b6413228170173c555521e5c7b160cd;hp=92307bdee12414fd4cce8a20f78ebee2b84c1263;hpb=fc83bfe29745415b7ab325a045d637d901450b22;p=xonotic%2Fdarkplaces.git diff --git a/menu.c b/menu.c index 92307bde..4c603d21 100644 --- a/menu.c +++ b/menu.c @@ -66,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 @@ -308,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) { @@ -404,7 +404,7 @@ void M_Main_Draw (void) } -void M_Main_Key (int key) +void M_Main_Key (int key, char ascii) { switch (key) { @@ -600,7 +600,7 @@ 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 || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { @@ -755,7 +755,7 @@ void M_Save_Draw (void) } -void M_Load_Key (int k) +void M_Load_Key (int k, char ascii) { switch (k) { @@ -793,7 +793,7 @@ void M_Load_Key (int k) } -void M_Save_Key (int k) +void M_Save_Key (int k, char ascii) { switch (k) { @@ -858,7 +858,7 @@ void M_MultiPlayer_Draw (void) } -void M_MultiPlayer_Key (int key) +void M_MultiPlayer_Key (int key, char ascii) { switch (key) { @@ -897,16 +897,17 @@ void M_MultiPlayer_Key (int key) //============================================================================= /* SETUP MENU */ -int setup_cursor = 3; -int setup_cursor_table[] = {40, 64, 88, 124}; +int setup_cursor = 4; +int setup_cursor_table[] = {40, 64, 88, 124, 140}; char setup_myname[32]; int setup_oldtop; int setup_oldbottom; int setup_top; int setup_bottom; +int setup_rate; -#define NUM_SETUP_CMDS 4 +#define NUM_SETUP_CMDS 5 void M_Menu_Setup_f (void) { @@ -916,12 +917,46 @@ void M_Menu_Setup_f (void) strcpy(setup_myname, cl_name.string); setup_top = setup_oldtop = cl_color.integer >> 4; setup_bottom = setup_oldbottom = cl_color.integer & 15; + setup_rate = cl_rate.integer; } static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load; static qbyte *menuplyr_pixels; static unsigned int *menuplyr_translated; +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"} +}; + +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; @@ -943,8 +978,11 @@ void M_Setup_Draw (void) M_Print (64, 88, "Pants color"); } - M_DrawTextBox (64, 124-8, 14, 1); - M_Print (72, 124, "Accept Changes"); + 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"); // LordHavoc: rewrote this code greatly if (menuplyr_load) @@ -988,7 +1026,7 @@ void M_Setup_Draw (void) } -void M_Setup_Key (int k) +void M_Setup_Key (int k, char ascii) { int l; @@ -1020,6 +1058,13 @@ void M_Setup_Key (int k) setup_top = setup_top - 1; 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 < 1) @@ -1030,16 +1075,23 @@ forward: setup_top = setup_top + 1; 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) return; - if (setup_cursor == 1 || setup_cursor == 2) + if (setup_cursor == 1 || setup_cursor == 2 || setup_cursor == 3) goto forward; - // setup_cursor == 3 (Accept changes) + // setup_cursor == 4 (Accept changes) if (strcmp(cl_name.string, setup_myname) != 0) Cbuf_AddText ( va ("name \"%s\"\n", setup_myname) ); if (setup_top != setup_oldtop || setup_bottom != setup_oldbottom) @@ -1057,7 +1109,7 @@ forward: break; default: - if (k < 32 || k > 127) + if (ascii < 32 || ascii > 126) break; if (setup_cursor == 0) { @@ -1065,7 +1117,7 @@ forward: if (l < 15) { setup_myname[l+1] = 0; - setup_myname[l] = k; + setup_myname[l] = ascii; } } } @@ -1112,7 +1164,7 @@ void M_DrawCheckbox (int x, int y, int on) } -#define OPTIONS_ITEMS 32 +#define OPTIONS_ITEMS 34 int options_cursor; @@ -1127,6 +1179,7 @@ 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) { @@ -1148,6 +1201,8 @@ void M_Menu_Options_AdjustSliders (int dir) Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120)); 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); else if (options_cursor == optnum++) @@ -1156,6 +1211,8 @@ void M_Menu_Options_AdjustSliders (int dir) Cvar_SetValueQuick (&gl_dither, !gl_dither.integer); else if (options_cursor == optnum++) Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer); + 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)); else if (options_cursor == optnum++) @@ -1211,7 +1268,7 @@ void M_Options_PrintCommand(char *s, int enabled) { if (opty >= 32) { - DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); + 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; @@ -1222,7 +1279,7 @@ void M_Options_PrintCheckbox(char *s, int enabled, int yes) { if (opty >= 32) { - DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); + 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); } @@ -1234,7 +1291,7 @@ void M_Options_PrintSlider(char *s, int enabled, float value, float minvalue, fl { if (opty >= 32) { - DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); + 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); } @@ -1253,8 +1310,6 @@ void M_Options_Draw (void) p = Draw_CachePic("gfx/p_option.lmp"); M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp"); - // LordHavoc: FIXME: overbright needs to be disabled in GAME_GOODVSBAD2 but combine should not be disabled - // LordHavoc: perhaps it's time for Overbright Bits to die, and a r_lightmapintensity option to be added? optnum = 0; optcursor = options_cursor; visible = (vid.conheight - 32) / 8; @@ -1273,14 +1328,16 @@ void M_Options_Draw (void) 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, bgmvolume.value, 0, 1); - M_Options_PrintSlider( " Sound Volume", snd_initialized, volume.value, 0, 1); - M_Options_PrintSlider(gamemode == GAME_GOODVSBAD2 ? " Music Volume" : " Ambient Volume", snd_initialized, snd_staticvolume.value, 0, 1); + 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); @@ -1295,7 +1352,7 @@ void M_Options_Draw (void) } -void M_Options_Key (int k) +void M_Options_Key (int k, char ascii) { switch (k) { @@ -1357,7 +1414,7 @@ void M_Options_Key (int k) } } -#define OPTIONS_EFFECTS_ITEMS 20 +#define OPTIONS_EFFECTS_ITEMS 22 int options_effects_cursor; @@ -1385,6 +1442,7 @@ extern cvar_t cl_particles_sparks; extern cvar_t cl_particles_bubbles; extern cvar_t cl_particles_blood; extern cvar_t cl_particles_blood_alpha; +extern cvar_t cl_particles_blood_bloodhack; void M_Menu_Options_Effects_AdjustSliders (int dir) { @@ -1392,46 +1450,28 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) S_LocalSound ("misc/menu3.wav"); 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, !r_coronas.integer); - 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 (&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_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)); + 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) @@ -1451,7 +1491,7 @@ void M_Options_Effects_Draw (void) 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_PrintCheckbox(" Coronas", true, r_coronas.integer); + 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); @@ -1466,14 +1506,16 @@ void M_Options_Effects_Draw (void) 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) +void M_Options_Effects_Key (int k, char ascii) { switch (k) { @@ -1645,8 +1687,8 @@ void M_Options_ColorControl_Draw (void) 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, v_hwgamma.integer); - M_Options_PrintSlider( " Gamma", !v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, v_gamma.value, 1, 5); + 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); @@ -1654,10 +1696,10 @@ void M_Options_ColorControl_Draw (void) 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 && v_hwgamma.integer, v_color_grey_r.value, 0, 0.95); - M_Options_PrintSlider( " Grey: Green", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, v_color_grey_g.value, 0, 0.95); - M_Options_PrintSlider( " Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, v_color_grey_b.value, 0, 0.95); - M_Options_PrintSlider( " Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported && 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( " 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); @@ -1701,12 +1743,12 @@ void M_Options_ColorControl_Draw (void) } -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: @@ -1728,7 +1770,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); @@ -1974,9 +2015,9 @@ void M_FindKeysForCommand (char *command, int *keys) count = 0; - for (j=0 ; j<256 ; j++) + for (j = 0; j < sizeof (keybindings[0]) / sizeof (keybindings[0][0]); j++) { - b = keybindings[j]; + b = keybindings[0][j]; if (!b) continue; if (!strcmp (b, command) ) @@ -1993,13 +2034,13 @@ void M_UnbindCommand (char *command) int j; char *b; - for (j=0 ; j<256 ; j++) + for (j = 0; j < sizeof (keybindings[0]) / 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, ""); } } @@ -2065,7 +2106,7 @@ void M_Keys_Draw (void) } -void M_Keys_Key (int k) +void M_Keys_Key (int k, char ascii) { char cmd[80]; int keys[NUMKEYS]; @@ -2136,20 +2177,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) @@ -2159,18 +2202,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]); } @@ -2201,12 +2244,8 @@ void M_Video_Draw (void) 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)); @@ -2223,10 +2262,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; @@ -2242,14 +2281,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) { @@ -2259,7 +2295,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 (); @@ -2269,7 +2304,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; @@ -2326,7 +2361,7 @@ void M_Help_Draw (void) } -void M_Help_Key (int key) +void M_Help_Key (int key, char ascii) { switch (key) { @@ -2440,7 +2475,7 @@ void M_Menu_Quit_f (void) } -void M_Quit_Key (int key) +void M_Quit_Key (int key, char ascii) { switch (key) { @@ -2573,7 +2608,7 @@ void M_LanConfig_Draw (void) } -void M_LanConfig_Key (int key) +void M_LanConfig_Key (int key, char ascii) { int l; @@ -2637,7 +2672,7 @@ void M_LanConfig_Key (int key) break; default: - if (key < 32 || key > 127) + if (ascii < 32 || ascii > 126) break; if (lanConfig_cursor == 2) @@ -2646,11 +2681,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) { @@ -2658,7 +2693,7 @@ void M_LanConfig_Key (int key) if (l < 5) { lanConfig_portname[l+1] = 0; - lanConfig_portname[l] = key; + lanConfig_portname[l] = ascii; } } } @@ -2881,6 +2916,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"}, @@ -2889,6 +2926,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"}, @@ -2900,6 +2938,8 @@ level_t transfusionlevels[] = {"crypt", "The Crypt"}, {"bb3_2k1", "Bodies Infusion"}, + {"captasao", "Captasao"}, + {"curandero", "Curandero"}, {"dcamp", "DeathCamp"}, {"highnoon", "HighNoon"}, {"qbb1", "The Confluence"}, @@ -2910,18 +2950,19 @@ 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[] = @@ -3297,7 +3338,7 @@ 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; @@ -3368,7 +3409,7 @@ void M_GameOptions_Key (int key) break; default: - if (key < 32 || key > 127) + if (ascii < 32 || ascii > 126) break; if (gameoptions_cursor == 8) { @@ -3376,7 +3417,7 @@ void M_GameOptions_Key (int key) if (l < 37) { memcpy(hostnamebuf, hostname.string, l); - hostnamebuf[l] = key; + hostnamebuf[l] = ascii; hostnamebuf[l+1] = 0; Cvar_Set("hostname", hostnamebuf); } @@ -3439,7 +3480,7 @@ void M_ServerList_Draw (void) } -void M_ServerList_Key(int k) +void M_ServerList_Key(int k, char ascii) { switch (k) { @@ -3481,26 +3522,17 @@ void M_ServerList_Key(int k) //============================================================================= /* Menu Subsystem */ -void M_Keydown(int key); +void M_Keydown(int key, char ascii); void M_Draw(void); void M_ToggleMenu_f(void); void M_Shutdown(void); void M_Init (void) { - // set menu router function pointer - MR_Keydown = M_Keydown; - MR_Draw = M_Draw; - MR_ToggleMenu_f = M_ToggleMenu_f; - MR_Shutdown = M_Shutdown; - - // init menu_mempool = Mem_AllocPool("Menu"); menuplyr_load = true; menuplyr_pixels = NULL; - Cmd_AddCommand ("togglemenu", M_ToggleMenu_f); - Cmd_AddCommand ("menu_main", M_Menu_Main_f); Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f); Cmd_AddCommand ("menu_load", M_Menu_Load_f); @@ -3667,7 +3699,7 @@ void M_Draw (void) } -void M_Keydown (int key) +void M_Keydown (int key, char ascii) { switch (m_state) { @@ -3675,76 +3707,82 @@ 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) { } @@ -3770,33 +3808,47 @@ 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_Printf("Falling back to normal menu.\n Error :"); - + Con_Printf("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 - M_Init(); + MR_SetRouting (TRUE); } -void MP_Keydown (int key) +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; - PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key) required\n"); + 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; @@ -3807,6 +3859,9 @@ 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; @@ -3817,16 +3872,15 @@ 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 : -/* // free mempools - Mem_FreePool(prog->edicts_mempool); - Mem_FreePool(prog->edictstring_mempool); - Mem_FreePool(prog->progs_mempool);*/ PRVM_ResetProg(); PRVM_End; @@ -3834,14 +3888,9 @@ void MP_Shutdown (void) void MP_Init (void) { - MR_Keydown = MP_Keydown; - MR_Draw = MP_Draw; - MR_ToggleMenu_f = MP_ToggleMenu_f; - MR_Shutdown = MP_Shutdown; - PRVM_Begin; PRVM_InitProg(PRVM_MENUPROG); - + prog->crc = M_PROGHEADER_CRC; prog->edictprivate_size = 0; // no private struct used prog->name = M_NAME; @@ -3852,50 +3901,106 @@ void MP_Init (void) 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_ChooseInit(void) +void MR_SetRouting(qboolean forceold) { - if(!FS_FileExists(M_PROG_FILENAME) || forceqmenu.integer) - M_Init(); + 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 - MP_Init(); + { + // 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_f(void) +void MR_Restart(void) { MR_Shutdown (); - MR_ChooseInit (); + 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_f); - - MR_ChooseInit (); + 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); }