X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=bac140cd074369f4362cf7e3c8bfede328a651eb;hb=9bc13b6cdcd9c514342f1fbdf35a3c5298710870;hp=73ff178a0720a3314154ef273bd059adedabafb3;hpb=1ded652d4ef15c4b64a1d82e01ed82c6e568d35b;p=xonotic%2Fdarkplaces.git diff --git a/menu.c b/menu.c index 73ff178a..bac140cd 100644 --- a/menu.c +++ b/menu.c @@ -1112,7 +1112,7 @@ void M_DrawCheckbox (int x, int y, int on) } -#define OPTIONS_ITEMS 33 +#define OPTIONS_ITEMS 34 int options_cursor; @@ -1149,6 +1149,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++) @@ -1256,8 +1258,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; @@ -1276,15 +1276,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); @@ -1361,7 +1362,7 @@ void M_Options_Key (int k, char ascii) } } -#define OPTIONS_EFFECTS_ITEMS 20 +#define OPTIONS_EFFECTS_ITEMS 22 int options_effects_cursor; @@ -1389,6 +1390,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) { @@ -1428,10 +1430,14 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) 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++) @@ -1470,8 +1476,10 @@ 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); } @@ -1649,8 +1657,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); @@ -1658,10 +1666,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); @@ -2147,6 +2155,8 @@ 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}, {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; @@ -2170,11 +2180,11 @@ void M_Menu_Video_f (void) break; } - // Default to 800x600 if we didn't find it + // 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]); } @@ -2223,10 +2233,10 @@ void M_Menu_Video_AdjustSliders (int dir) case 0: { int new_resolution = video_resolution + dir; - if (new_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) - video_resolution = 0; + video_resolution = gamemode == GAME_FNIGGIUM ? VID_640 : 0; else video_resolution = new_resolution;