X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=a719a2d2d3b46fe9bd7f2f92623bf9cf6679d7b5;hb=e61e64e24dc955e55dee4b26ffa4ea1e6fbe7701;hp=f01dda9a14a3ee4a0544a7a94a75f2628f08e846;hpb=94fe2725e237afaad3a920f0958d0eb4d858ad1a;p=xonotic%2Fdarkplaces.git diff --git a/menu.c b/menu.c index f01dda9a..a719a2d2 100644 --- a/menu.c +++ b/menu.c @@ -20,6 +20,7 @@ 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 @@ -65,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 @@ -307,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) { @@ -327,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; } @@ -403,7 +404,7 @@ void M_Main_Draw (void) } -void M_Main_Key (int key) +void M_Main_Key (int key, char ascii) { switch (key) { @@ -599,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) { @@ -683,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 ; j 127) + if (ascii < 32 || ascii > 126) break; if (setup_cursor == 0) { @@ -1064,7 +1065,7 @@ forward: if (l < 15) { setup_myname[l+1] = 0; - setup_myname[l] = k; + setup_myname[l] = ascii; } } } @@ -1095,7 +1096,10 @@ 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, "%f", 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); } @@ -1108,7 +1112,7 @@ void M_DrawCheckbox (int x, int y, int on) } -#define OPTIONS_ITEMS 32 +#define OPTIONS_ITEMS 34 int options_cursor; @@ -1123,6 +1127,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) { @@ -1131,7 +1136,9 @@ void M_Menu_Options_AdjustSliders (int dir) optnum = 6; if (options_cursor == optnum++) - Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1)); + 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++) @@ -1143,15 +1150,17 @@ void M_Menu_Options_AdjustSliders (int dir) else if (options_cursor == optnum++) Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer); else if (options_cursor == optnum++) - Cvar_SetValueQuick (&r_sky, !r_sky.integer); + Cvar_SetValueQuick (&scr_screenshot_jpeg, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1)); else if (options_cursor == optnum++) - Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4)); + Cvar_SetValueQuick (&r_sky, !r_sky.integer); else if (options_cursor == optnum++) Cvar_SetValueQuick (&gl_combine, !gl_combine.integer); else if (options_cursor == optnum++) 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++) @@ -1199,9 +1208,48 @@ void M_Menu_Options_AdjustSliders (int dir) Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer); } +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); @@ -1210,53 +1258,49 @@ 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, " Console Speed");M_DrawSlider(220, y, scr_conspeed.value, 0, 1000);y += 8; - M_Print(16, y, " Console Alpha");M_DrawSlider(220, y, scr_conalpha.value, 0, 1);y += 8; - M_Print(16, y, " Conback Brightness");M_DrawSlider(220, y, scr_conbrightness.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; - // 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? - 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; - if (gamemode == GAME_GOODVSBAD2) - M_ItemPrint(16, y, " Music Volume", snd_initialized); - else - M_ItemPrint(16, y, " Ambient Sound Volume", snd_initialized); - M_DrawSlider(220, y, snd_staticvolume.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(" 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) { @@ -1318,7 +1362,7 @@ void M_Options_Key (int k) } } -#define OPTIONS_EFFECTS_ITEMS 20 +#define OPTIONS_EFFECTS_ITEMS 22 int options_effects_cursor; @@ -1336,7 +1380,6 @@ 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; @@ -1347,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) { @@ -1356,8 +1400,6 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) 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_dlightmap, !r_dlightmap.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, !r_coronas.integer); else if (options_effects_cursor == optnum++) @@ -1388,17 +1430,23 @@ 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++) + 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); @@ -1407,34 +1455,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, " Particles Quality");M_DrawSlider(220, y, cl_particles_quality.value, 1, 4);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, " Decals");M_DrawCheckbox(220, y, cl_decals.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 Opacity");M_DrawSlider(220, y, cl_particles_blood_alpha.value, 0.2, 1);y += 8; - M_Print(16, y, " Model Interpolation");M_DrawCheckbox(220, y, r_lerpmodels.integer);y += 8; - M_Print(16, y, " Sprite Interpolation");M_DrawCheckbox(220, y, r_lerpsprites.integer);y += 8; - M_Print(16, y, " Water Movement");M_DrawSlider(220, y, r_waterscroll.value, 0, 10);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_PrintCheckbox(" Coronas", true, r_coronas.integer); + 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) { @@ -1590,7 +1641,8 @@ void M_Menu_Options_ColorControl_AdjustSliders (int dir) 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); @@ -1599,73 +1651,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: @@ -2024,7 +2077,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]; @@ -2095,20 +2148,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) @@ -2118,18 +2173,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]); } @@ -2160,12 +2215,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)); @@ -2182,10 +2233,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) + video_resolution = gamemode == GAME_FNIGGIUM ? VID_640 : 0; else video_resolution = new_resolution; @@ -2201,14 +2252,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) { @@ -2218,7 +2266,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 (); @@ -2228,7 +2275,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; @@ -2285,7 +2332,7 @@ void M_Help_Draw (void) } -void M_Help_Key (int key) +void M_Help_Key (int key, char ascii) { switch (key) { @@ -2399,7 +2446,7 @@ void M_Menu_Quit_f (void) } -void M_Quit_Key (int key) +void M_Quit_Key (int key, char ascii) { switch (key) { @@ -2532,7 +2579,7 @@ void M_LanConfig_Draw (void) } -void M_LanConfig_Key (int key) +void M_LanConfig_Key (int key, char ascii) { int l; @@ -2596,7 +2643,7 @@ void M_LanConfig_Key (int key) break; default: - if (key < 32 || key > 127) + if (ascii < 32 || ascii > 126) break; if (lanConfig_cursor == 2) @@ -2605,11 +2652,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) { @@ -2617,7 +2664,7 @@ void M_LanConfig_Key (int key) if (l < 5) { lanConfig_portname[l+1] = 0; - lanConfig_portname[l] = key; + lanConfig_portname[l] = ascii; } } } @@ -2970,7 +3017,7 @@ void M_Menu_GameOptions_f (void) m_state = m_gameoptions; m_entersound = true; if (maxplayers == 0) - maxplayers = sv_maxplayers.integer; + maxplayers = svs.maxclients; if (maxplayers < 2) maxplayers = min(8, MAX_SCOREBOARD); } @@ -3256,7 +3303,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; @@ -3327,7 +3374,7 @@ void M_GameOptions_Key (int key) break; default: - if (key < 32 || key > 127) + if (ascii < 32 || ascii > 126) break; if (gameoptions_cursor == 8) { @@ -3335,7 +3382,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); } @@ -3363,30 +3410,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) + { + 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) { - M_Print(0, y, hostcache[n].line1);y += 8; - M_Print(0, y, hostcache[n].line2);y += 8; + 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_Print(16, vid.conheight - 8, m_return_reason); } -void M_ServerList_Key(int k) +void M_ServerList_Key(int k, char ascii) { switch (k) { @@ -3428,6 +3487,10 @@ 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) { @@ -3515,6 +3578,7 @@ void M_Draw (void) { if (key_dest != key_menu) m_state = m_none; + if (m_state == m_none) return; @@ -3602,7 +3666,7 @@ void M_Draw (void) } -void M_Keydown (int key) +void M_Keydown (int key, char ascii) { switch (m_state) { @@ -3610,72 +3674,295 @@ 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_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 + 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 MR_Init() +{ + // set router console commands + Cvar_RegisterVariable (&forceqmenu); + Cmd_AddCommand ("menu_restart",MR_Restart); + + // 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); +} + + + +