X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=f5b9d54484aea8c04b5c70e46096ee23b5f950ae;hp=4c603d21326d566c4728231b5ec83a0badff3937;hb=09793c7b04deff7f9e39af50fc016751dcf6ec81;hpb=1bacdbe28bff6bc631ff07ab6fcdcd56c4ff8040 diff --git a/menu.c b/menu.c index 4c603d21..f5b9d544 100644 --- a/menu.c +++ b/menu.c @@ -164,7 +164,7 @@ 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); } @@ -174,7 +174,7 @@ void M_PrintRed (float cx, float cy, const char *str) 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); @@ -294,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)); @@ -317,7 +317,7 @@ void M_Demo_Key (int k, char ascii) break; case K_ENTER: - S_LocalSound ("misc/menu2.wav"); + S_LocalSound ("misc/menu2.wav", true); m_state = m_none; key_dest = key_game; Cbuf_AddText (va ("playdemo %s\n", NehahraDemos[demo_cursor].name)); @@ -325,7 +325,7 @@ void M_Demo_Key (int k, char ascii) case K_UPARROW: case K_LEFTARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); demo_cursor--; if (demo_cursor < 0) demo_cursor = NumberOfNehahraDemos-1; @@ -333,7 +333,7 @@ void M_Demo_Key (int k, char ascii) case K_DOWNARROW: case K_RIGHTARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); demo_cursor++; if (demo_cursor >= NumberOfNehahraDemos) demo_cursor = 0; @@ -417,13 +417,13 @@ void M_Main_Key (int key, char ascii) break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); if (++m_main_cursor >= MAIN_ITEMS) m_main_cursor = 0; break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); if (--m_main_cursor < 0) m_main_cursor = MAIN_ITEMS - 1; break; @@ -577,14 +577,14 @@ void M_SinglePlayer_Draw (void) M_DrawTextBox (60, 8 * 8, 23, 4); if (gamemode == GAME_NEXUIZ) - M_Print (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"); + M_Print(95, 10 * 8, "Good Vs Bad 2 is for"); else if (gamemode == GAME_BATTLEMECH) - M_Print (95, 10 * 8, "Battlemech is for"); + M_Print(95, 10 * 8, "Battlemech is for"); else - M_Print (95, 10 * 8, "Transfusion is for"); - M_Print (83, 11 * 8, "multiplayer play only"); + M_Print(95, 10 * 8, "Transfusion is for"); + M_Print(83, 11 * 8, "multiplayer play only"); } else { @@ -616,13 +616,13 @@ void M_SinglePlayer_Key (int key, char ascii) break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); if (++m_singleplayer_cursor >= SINGLEPLAYER_ITEMS) m_singleplayer_cursor = 0; break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); if (--m_singleplayer_cursor < 0) m_singleplayer_cursor = SINGLEPLAYER_ITEMS - 1; break; @@ -730,7 +730,7 @@ void M_Load_Draw (void) M_DrawPic ( (320-p->width)/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)); @@ -748,7 +748,7 @@ void M_Save_Draw (void) M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp"); for (i=0 ; i= MAX_SAVEGAMES) load_cursor = 0; @@ -809,7 +809,7 @@ void M_Save_Key (int k, char ascii) case K_UPARROW: case K_LEFTARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); load_cursor--; if (load_cursor < 0) load_cursor = MAX_SAVEGAMES-1; @@ -817,7 +817,7 @@ void M_Save_Key (int k, char ascii) case K_DOWNARROW: case K_RIGHTARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); load_cursor++; if (load_cursor >= MAX_SAVEGAMES) load_cursor = 0; @@ -867,13 +867,13 @@ void M_MultiPlayer_Key (int key, char ascii) break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); if (++m_multiplayer_cursor >= MULTIPLAYER_ITEMS) m_multiplayer_cursor = 0; break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); if (--m_multiplayer_cursor < 0) m_multiplayer_cursor = MULTIPLAYER_ITEMS - 1; break; @@ -906,6 +906,7 @@ int setup_oldbottom; int setup_top; int setup_bottom; int setup_rate; +int setup_oldrate; #define NUM_SETUP_CMDS 5 @@ -968,21 +969,21 @@ 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, "Your name"); + M_Print(64, 40, "Your name"); M_DrawTextBox (160, 32, 16, 1); - M_Print (168, 40, setup_myname); + M_Print(168, 40, setup_myname); if (gamemode != GAME_GOODVSBAD2) { - M_Print (64, 64, "Shirt color"); - M_Print (64, 88, "Pants color"); + M_Print(64, 64, "Shirt color"); + M_Print(64, 88, "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_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_Print(72, 140, "Accept Changes"); // LordHavoc: rewrote this code greatly if (menuplyr_load) @@ -991,7 +992,7 @@ void M_Setup_Draw (void) menuplyr_load = false; menuplyr_top = -1; menuplyr_bottom = -1; - if ((f = FS_LoadFile("gfx/menuplyr.lmp", true))) + if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true))) { data = LoadLMPAs8Bit (f, 0, 0); menuplyr_width = image_width; @@ -1037,14 +1038,14 @@ void M_Setup_Key (int k, char ascii) break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); setup_cursor--; if (setup_cursor < 0) setup_cursor = NUM_SETUP_CMDS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); setup_cursor++; if (setup_cursor >= NUM_SETUP_CMDS) setup_cursor = 0; @@ -1053,7 +1054,7 @@ void M_Setup_Key (int k, char ascii) case K_LEFTARROW: if (setup_cursor < 1) return; - S_LocalSound ("misc/menu3.wav"); + S_LocalSound ("misc/menu3.wav", true); if (setup_cursor == 1) setup_top = setup_top - 1; if (setup_cursor == 2) @@ -1070,7 +1071,7 @@ void M_Setup_Key (int k, char ascii) if (setup_cursor < 1) return; forward: - S_LocalSound ("misc/menu3.wav"); + S_LocalSound ("misc/menu3.wav", true); if (setup_cursor == 1) setup_top = setup_top + 1; if (setup_cursor == 2) @@ -1096,6 +1097,9 @@ forward: Cbuf_AddText ( va ("name \"%s\"\n", setup_myname) ); if (setup_top != setup_oldtop || setup_bottom != setup_oldbottom) Cbuf_AddText( va ("color %i %i\n", setup_top, setup_bottom) ); + if (setup_rate != setup_oldrate) + Cbuf_AddText(va("rate %i\n", setup_rate)); + m_entersound = true; M_Menu_MultiPlayer_f (); break; @@ -1158,13 +1162,13 @@ void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax) 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 34 +#define OPTIONS_ITEMS 37 int options_cursor; @@ -1184,7 +1188,7 @@ extern cvar_t gl_texture_anisotropy; void M_Menu_Options_AdjustSliders (int dir) { int optnum; - S_LocalSound ("misc/menu3.wav"); + S_LocalSound ("misc/menu3.wav", true); optnum = 6; if (options_cursor == optnum++) @@ -1199,6 +1203,8 @@ void M_Menu_Options_AdjustSliders (int dir) 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)); + else if (options_cursor == optnum++) + Cvar_SetValueQuick (&scr_fov, bound(1, scr_fov.integer + dir * 1, 170)); else if (options_cursor == optnum++) Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer); else if (options_cursor == optnum++) @@ -1212,15 +1218,11 @@ void M_Menu_Options_AdjustSliders (int dir) 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)); + Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.integer + dir, gl_max_anisotropy)); else if (options_cursor == optnum++) Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5)); else if (options_cursor == optnum++) -#ifdef _WIN32 - Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 1.0, 1)); -#else Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1)); -#endif else if (options_cursor == optnum++) Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1)); else if (options_cursor == optnum++) @@ -1233,6 +1235,10 @@ void M_Menu_Options_AdjustSliders (int dir) Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer); else if (options_cursor == optnum++) Cvar_SetValueQuick (&showfps, !showfps.integer); + 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) @@ -1327,13 +1333,14 @@ void M_Options_Draw (void) 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_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170); 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( "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy); 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); @@ -1342,6 +1349,8 @@ void M_Options_Draw (void) 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); @@ -1391,14 +1400,14 @@ void M_Options_Key (int k, char ascii) return; case K_UPARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); options_cursor--; if (options_cursor < 0) options_cursor = OPTIONS_ITEMS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); options_cursor++; if (options_cursor >= OPTIONS_ITEMS) options_cursor = 0; @@ -1414,7 +1423,7 @@ void M_Options_Key (int k, char ascii) } } -#define OPTIONS_EFFECTS_ITEMS 22 +#define OPTIONS_EFFECTS_ITEMS 33 int options_effects_cursor; @@ -1443,11 +1452,18 @@ 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; +extern cvar_t r_lightningbeam_thickness; +extern cvar_t r_lightningbeam_scroll; +extern cvar_t r_lightningbeam_repeatdistance; +extern cvar_t r_lightningbeam_color_red; +extern cvar_t r_lightningbeam_color_green; +extern cvar_t r_lightningbeam_color_blue; +extern cvar_t r_lightningbeam_qmbtexture; void M_Menu_Options_Effects_AdjustSliders (int dir) { int optnum; - S_LocalSound ("misc/menu3.wav"); + S_LocalSound ("misc/menu3.wav", true); optnum = 0; if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8)); @@ -1467,8 +1483,19 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) 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_lightningbeam_thickness, bound(1, r_lightningbeam_thickness.integer + dir, 10)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_scroll, bound(0, r_lightningbeam_scroll.integer + dir, 10)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_repeatdistance, bound(64, r_lightningbeam_repeatdistance.integer + dir * 64, 1024)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_color_red, bound(0, r_lightningbeam_color_red.value + dir * 0.1, 1)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_color_green, bound(0, r_lightningbeam_color_green.value + dir * 0.1, 1)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_color_blue, bound(0, r_lightningbeam_color_blue.value + dir * 0.1, 1)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_qmbtexture, !r_lightningbeam_qmbtexture.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 (&gl_polyblend, bound(0, gl_polyblend.value + dir * 0.1, 1)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_skyscroll1, bound(-8, r_skyscroll1.value + dir * 0.1, 8)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_skyscroll2, bound(-8, r_skyscroll2.value + dir * 0.1, 8)); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterwarp, bound(0, r_waterwarp.value + dir * 0.1, 1)); 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)); @@ -1507,8 +1534,19 @@ void M_Options_Effects_Draw (void) 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_PrintSlider( " Lightning Thickness", true, r_lightningbeam_thickness.integer, 1, 10); + M_Options_PrintSlider( " Lightning Scroll", true, r_lightningbeam_scroll.integer, 0, 10); + M_Options_PrintSlider( " Lightning Repeat Dist", true, r_lightningbeam_repeatdistance.integer, 64, 1024); + M_Options_PrintSlider( " Lightning Color Red", true, r_lightningbeam_color_red.value, 0, 1); + M_Options_PrintSlider( " Lightning Color Green", true, r_lightningbeam_color_green.value, 0, 1); + M_Options_PrintSlider( " Lightning Color Blue", true, r_lightningbeam_color_blue.value, 0, 1); + M_Options_PrintCheckbox(" Lightning QMB Texture", true, r_lightningbeam_qmbtexture.integer); M_Options_PrintCheckbox(" Model Interpolation", true, r_lerpmodels.integer); M_Options_PrintCheckbox(" Sprite Interpolation", true, r_lerpsprites.integer); + M_Options_PrintSlider( " View Blend", true, gl_polyblend.value, 0, 1); + M_Options_PrintSlider( "Upper Sky Scroll Speed", true, r_skyscroll1.value, -8, 8); + M_Options_PrintSlider( "Lower Sky Scroll Speed", true, r_skyscroll2.value, -8, 8); + M_Options_PrintSlider( " Underwater View Warp", true, r_waterwarp.value, 0, 1); 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); @@ -1528,14 +1566,14 @@ void M_Options_Effects_Key (int k, char ascii) break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); options_effects_cursor--; if (options_effects_cursor < 0) options_effects_cursor = OPTIONS_EFFECTS_ITEMS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); options_effects_cursor++; if (options_effects_cursor >= OPTIONS_EFFECTS_ITEMS) options_effects_cursor = 0; @@ -1574,7 +1612,7 @@ void M_Menu_Options_ColorControl_AdjustSliders (int dir) { int optnum; float f; - S_LocalSound ("misc/menu3.wav"); + S_LocalSound ("misc/menu3.wav", true); optnum = 1; if (options_colorcontrol_cursor == optnum++) @@ -1778,14 +1816,14 @@ void M_Options_ColorControl_Key (int k, char ascii) return; case K_UPARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); options_colorcontrol_cursor--; if (options_colorcontrol_cursor < 0) options_colorcontrol_cursor = OPTIONS_COLORCONTROL_ITEMS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); options_colorcontrol_cursor++; if (options_colorcontrol_cursor >= OPTIONS_COLORCONTROL_ITEMS) options_colorcontrol_cursor = 0; @@ -1872,7 +1910,18 @@ char *transfusionbindnames[][2] = {"impulse 26", "next armor type"}, {"impulse 27", "identify player"}, {"impulse 55", "voting menu"}, -{"impulse 56", "observer mode"} +{"impulse 56", "observer mode"}, +{"", "Taunts"}, // Taunts +{"impulse 70", "taunt 0"}, +{"impulse 71", "taunt 1"}, +{"impulse 72", "taunt 2"}, +{"impulse 73", "taunt 3"}, +{"impulse 74", "taunt 4"}, +{"impulse 75", "taunt 5"}, +{"impulse 76", "taunt 6"}, +{"impulse 77", "taunt 7"}, +{"impulse 78", "taunt 8"}, +{"impulse 79", "taunt 9"} }; char *goodvsbad2bindnames[][2] = @@ -2015,7 +2064,7 @@ void M_FindKeysForCommand (char *command, int *keys) count = 0; - for (j = 0; j < sizeof (keybindings[0]) / sizeof (keybindings[0][0]); j++) + for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++) { b = keybindings[0][j]; if (!b) @@ -2034,7 +2083,7 @@ void M_UnbindCommand (char *command) int j; char *b; - for (j = 0; j < sizeof (keybindings[0]) / sizeof (keybindings[0][0]); j++) + for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++) { b = keybindings[0][j]; if (!b) @@ -2059,9 +2108,9 @@ void M_Keys_Draw (void) 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= VIDEO_ITEMS) video_cursor = 0; @@ -2575,24 +2624,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)); @@ -2604,7 +2653,7 @@ 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_Print (basex, 168, m_return_reason); + M_Print(basex, 168, m_return_reason); } @@ -2619,14 +2668,14 @@ void M_LanConfig_Key (int key, char ascii) break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); lanConfig_cursor--; if (lanConfig_cursor < 0) lanConfig_cursor = NUM_LANCONFIG_CMDS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); lanConfig_cursor++; if (lanConfig_cursor >= NUM_LANCONFIG_CMDS) lanConfig_cursor = 0; @@ -3075,43 +3124,43 @@ 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) ); if (gamemode != GAME_GOODVSBAD2) { - M_Print (0, 64, " Game Type"); + 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"); + M_Print(160, 64, "Capture the Flag"); else - M_Print (160, 64, "Blood Bath"); + 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"); + M_Print(160, 64, "Rambo Match"); else - M_Print (160, 64, "Deathmatch"); + M_Print(160, 64, "Deathmatch"); } else { if (!coop.integer && !deathmatch.integer) Cvar_SetValue("deathmatch", 1); if (coop.integer) - M_Print (160, 64, "Cooperative"); + M_Print(160, 64, "Cooperative"); else - M_Print (160, 64, "Deathmatch"); + M_Print(160, 64, "Deathmatch"); } - M_Print (0, 72, " Teamplay"); + M_Print(0, 72, " Teamplay"); if (gamemode == GAME_ROGUE) { char *msg; @@ -3126,7 +3175,7 @@ void M_GameOptions_Draw (void) case 6: msg = "Three Team CTF"; break; default: msg = "Off"; break; } - M_Print (160, 72, msg); + M_Print(160, 72, msg); } else { @@ -3138,50 +3187,50 @@ void M_GameOptions_Draw (void) 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"); + M_Print(0, 80, " Skill"); if (skill.integer == 0) - M_Print (160, 80, "Easy difficulty"); + M_Print(160, 80, "Easy difficulty"); else if (skill.integer == 1) - M_Print (160, 80, "Normal difficulty"); + M_Print(160, 80, "Normal difficulty"); else if (skill.integer == 2) - M_Print (160, 80, "Hard difficulty"); + M_Print(160, 80, "Hard difficulty"); else - M_Print (160, 80, "Nightmare difficulty"); + M_Print(160, 80, "Nightmare difficulty"); - M_Print (0, 88, " Frag Limit"); + M_Print(0, 88, " Frag Limit"); if (fraglimit.integer == 0) - M_Print (160, 88, "none"); + M_Print(160, 88, "none"); else - M_Print (160, 88, va("%i frags", fraglimit.integer)); + M_Print(160, 88, va("%i frags", fraglimit.integer)); - M_Print (0, 96, " Time Limit"); + M_Print(0, 96, " Time Limit"); if (timelimit.integer == 0) - M_Print (160, 96, "none"); + M_Print(160, 96, "none"); else - M_Print (160, 96, va("%i minutes", timelimit.integer)); + 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_Print(0, 120, " Server name"); M_DrawTextBox (0, 124, 38, 1); - M_Print (8, 132, hostname.string); + M_Print(8, 132, hostname.string); g = lookupgameinfo(); if (gamemode != GAME_GOODVSBAD2) { - M_Print (0, 152, " Episode"); - M_Print (160, 152, g->episodes[startepisode].description); + M_Print(0, 152, " Episode"); + M_Print(160, 152, g->episodes[startepisode].description); } - 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); + 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 if (gameoptions_cursor == 8) @@ -3196,10 +3245,10 @@ 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; @@ -3351,14 +3400,14 @@ void M_GameOptions_Key (int key, char ascii) break; case K_UPARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); gameoptions_cursor--; if (gameoptions_cursor < 0) gameoptions_cursor = NUM_GAMEOPTIONS-1; break; case K_DOWNARROW: - S_LocalSound ("misc/menu1.wav"); + S_LocalSound ("misc/menu1.wav", true); gameoptions_cursor++; if (gameoptions_cursor >= NUM_GAMEOPTIONS) gameoptions_cursor = 0; @@ -3367,19 +3416,19 @@ void M_GameOptions_Key (int key, char ascii) case K_LEFTARROW: if (gameoptions_cursor == 0) break; - S_LocalSound ("misc/menu3.wav"); + S_LocalSound ("misc/menu3.wav", true); M_NetStart_Change (-1); break; case K_RIGHTARROW: if (gameoptions_cursor == 0) break; - S_LocalSound ("misc/menu3.wav"); + S_LocalSound ("misc/menu3.wav", true); M_NetStart_Change (1); break; case K_ENTER: - S_LocalSound ("misc/menu2.wav"); + S_LocalSound ("misc/menu2.wav", true); if (gameoptions_cursor == 0) { if (sv.active) @@ -3494,7 +3543,7 @@ void M_ServerList_Key(int k, char ascii) case K_UPARROW: case K_LEFTARROW: - S_LocalSound("misc/menu1.wav"); + S_LocalSound("misc/menu1.wav", true); slist_cursor--; if (slist_cursor < 0) slist_cursor = hostCacheCount - 1; @@ -3502,14 +3551,14 @@ void M_ServerList_Key(int k, char ascii) case K_DOWNARROW: case K_RIGHTARROW: - S_LocalSound("misc/menu1.wav"); + S_LocalSound("misc/menu1.wav", true); slist_cursor++; if (slist_cursor >= hostCacheCount) slist_cursor = 0; break; case K_ENTER: - S_LocalSound("misc/menu2.wav"); + S_LocalSound("misc/menu2.wav", true); Cbuf_AddText(va("connect \"%s\"\n", hostcache[slist_cursor].cname)); break; @@ -3582,12 +3631,12 @@ void M_Init (void) { 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; } } @@ -3595,12 +3644,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... } } @@ -3691,7 +3740,7 @@ void M_Draw (void) if (m_entersound) { - S_LocalSound ("misc/menu2.wav"); + S_LocalSound ("misc/menu2.wav", true); m_entersound = false; } @@ -3793,6 +3842,10 @@ 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" +// ng_menu function names +#define M_F_DISPLAY "m_display" +#define M_F_HIDE "m_hide" +// normal menu names (rest) #define M_F_TOGGLE "m_toggle" #define M_F_SHUTDOWN "m_shutdown" @@ -3800,13 +3853,22 @@ static char *m_required_func[] = { M_F_INIT, M_F_KEYDOWN, M_F_DRAW, +#ifdef NG_MENU +M_F_DISPLAY, +M_F_HIDE, +#else M_F_TOGGLE, +#endif M_F_SHUTDOWN, }; +#ifdef NG_MENU +qboolean m_displayed; +#endif + static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*); -static func_t m_draw,m_keydown; +static func_t m_draw, m_keydown; void MR_SetRouting (qboolean forceold); @@ -3815,7 +3877,7 @@ void MP_Error(void) // fall back to the normal menu // say it - Con_Printf("Falling back to normal menu\n"); + Con_Print("Falling back to normal menu\n"); key_dest = key_game; @@ -3862,7 +3924,15 @@ void MP_ToggleMenu_f (void) // set time *prog->time = realtime; +#ifdef NG_MENU + m_displayed = !m_displayed; + if( m_displayed ) + PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_DISPLAY) - prog->functions),""); + else + PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_HIDE) - prog->functions),""); +#else PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_TOGGLE) - prog->functions),""); +#endif PRVM_End; } @@ -3913,6 +3983,10 @@ void MP_Init (void) m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions); m_keydown = (func_t) (PRVM_ED_FindFunction(M_F_KEYDOWN) - prog->functions); +#ifdef NG_MENU + m_displayed = false; +#endif + // set time *prog->time = realtime; @@ -3999,8 +4073,8 @@ void MR_Init() // the normal quake menu only the first time else if(COM_CheckParm("-useqmenu")) MR_SetRouting (TRUE); - else - MR_SetRouting (FALSE); + + MR_SetRouting (FALSE); }