void M_Menu_Setup_f (void);
void M_Menu_Options_f (void);
void M_Menu_Options_Effects_f (void);
+ void M_Menu_Options_Graphics_f (void);
void M_Menu_Options_ColorControl_f (void);
void M_Menu_Keys_f (void);
void M_Menu_Video_f (void);
void M_Setup_Draw (void);
void M_Options_Draw (void);
void M_Options_Effects_Draw (void);
+ void M_Options_Graphics_Draw (void);
void M_Options_ColorControl_Draw (void);
void M_Keys_Draw (void);
void M_Video_Draw (void);
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_Graphics_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);
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));
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;
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;
else
MAIN_ITEMS = 6;
}
+ else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
+ MAIN_ITEMS = 6;
else
MAIN_ITEMS = 5;
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;
break;
}
}
+ else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
+ {
+ switch (m_main_cursor)
+ {
+ case 0:
+ M_Menu_SinglePlayer_f ();
+ break;
+
+ case 1:
+ M_Menu_MultiPlayer_f ();
+ break;
+
+ case 2:
+ M_Menu_Options_f ();
+ break;
+
+ case 3:
+ M_Menu_Help_f ();
+ break;
+
+ case 4:
+ M_Menu_Quit_f ();
+ break;
+ case 5:
+ MR_Restart();
+ break;
+ }
+ }
else
{
switch (m_main_cursor)
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;
break;
case K_ENTER:
- S_LocalSound ("misc/menu2.wav");
+ S_LocalSound ("misc/menu2.wav", true);
if (!loadable[load_cursor])
return;
m_state = m_none;
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;
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;
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;
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;
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;
int setup_top;
int setup_bottom;
int setup_rate;
+int setup_oldrate;
#define NUM_SETUP_CMDS 5
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;
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)
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)
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;
}
-#define OPTIONS_ITEMS 36
+#define OPTIONS_ITEMS 40
int options_cursor;
}
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;
+extern cvar_t r_textshadow;
void M_Menu_Options_AdjustSliders (int dir)
{
int optnum;
- S_LocalSound ("misc/menu3.wav");
+ S_LocalSound ("misc/menu3.wav", true);
- optnum = 6;
+ optnum = 7;
if (options_cursor == optnum++)
Cvar_SetValueQuick (&vid_conwidth, bound(320, vid_conwidth.value + dir * 64, 2048));
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&scr_conalpha, bound(0, scr_conalpha.value + dir * 0.2, 1));
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&scr_conbrightness, bound(0, scr_conbrightness.value + dir * 0.2, 1));
+ else if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&sbar_alpha_bg, bound(0, sbar_alpha_bg.value + dir * 0.1, 1));
+ else if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&sbar_alpha_fg, bound(0, sbar_alpha_fg.value + dir * 0.1, 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++)
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(1, 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++)
Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&snd_staticvolume, bound(0, snd_staticvolume.value + dir * 0.1, 1));
+ else if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&r_textshadow, !r_textshadow.integer);
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5));
else if (options_cursor == optnum++)
M_Options_PrintCommand( " Reset to defaults", true);
M_Options_PrintCommand( " Video", true);
M_Options_PrintCommand( " Effects", true);
+ M_Options_PrintCommand( " Graphics", 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( " Sbar Alpha BG", true, sbar_alpha_bg.value, 0, 1);
+ M_Options_PrintSlider( " Sbar Alpha FG", true, sbar_alpha_fg.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, 1, 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);
M_Options_PrintSlider(gamemode == GAME_GOODVSBAD2 ? " Music Volume" : " Ambient Volume", snd_initialized.integer, snd_staticvolume.value, 0, 1);
+ M_Options_PrintCheckbox(" Text Shadow", true, r_textshadow.integer);
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_Menu_Options_Effects_f ();
break;
case 5:
+ M_Menu_Options_Graphics_f ();
+ break;
+ case 6:
M_Menu_Options_ColorControl_f ();
break;
default:
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;
}
}
-#define OPTIONS_EFFECTS_ITEMS 22
+#define OPTIONS_EFFECTS_ITEMS 33
int options_effects_cursor;
extern cvar_t r_detailtextures;
extern cvar_t cl_particles;
-extern cvar_t cl_explosions;
extern cvar_t cl_stainmaps;
extern cvar_t cl_decals;
extern cvar_t r_explosionclip;
extern cvar_t cl_particles_blood;
extern cvar_t cl_particles_blood_alpha;
extern cvar_t cl_particles_blood_bloodhack;
+extern cvar_t cl_particles_explosions_shell;
+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));
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 (&cl_particles_explosions_shell, !cl_particles_explosions_shell.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 (&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));
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(" Explosion Shell", true, cl_particles_explosions_shell.integer);
+ M_Options_PrintCheckbox(" Explosion Shell Clip", 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(" 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);
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;
}
+#define OPTIONS_GRAPHICS_ITEMS 7
+
+int options_graphics_cursor;
+
+void M_Menu_Options_Graphics_f (void)
+{
+ key_dest = key_menu;
+ m_state = m_options_graphics;
+ m_entersound = true;
+}
+
+extern cvar_t r_shadow_gloss;
+extern cvar_t r_shadow_realtime_dlight;
+extern cvar_t r_shadow_realtime_dlight_shadows;
+extern cvar_t r_shadow_realtime_world;
+extern cvar_t r_shadow_realtime_world_dlightshadows;
+extern cvar_t r_shadow_realtime_world_lightmaps;
+extern cvar_t r_shadow_realtime_world_shadows;
+
+void M_Menu_Options_Graphics_AdjustSliders (int dir)
+{
+ int optnum;
+ S_LocalSound ("misc/menu3.wav", true);
+
+ optnum = 0;
+
+ if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss, bound(0, r_shadow_gloss.integer + dir, 2));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight, !r_shadow_realtime_dlight.integer);
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight_shadows, !r_shadow_realtime_dlight_shadows.integer);
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world, !r_shadow_realtime_world.integer);
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_dlightshadows, !r_shadow_realtime_world_dlightshadows.integer);
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps, !r_shadow_realtime_world_lightmaps.integer);
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_shadows, !r_shadow_realtime_world_shadows.integer);
+}
+
+
+void M_Options_Graphics_Draw (void)
+{
+ int visible;
+ cachepic_t *p;
+
+ M_Background(320, 200);
+
+ M_DrawPic(16, 4, "gfx/qplaque.lmp");
+ p = Draw_CachePic("gfx/p_option.lmp");
+ M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
+
+ optcursor = options_graphics_cursor;
+ optnum = 0;
+ visible = (vid.conheight - 32) / 8;
+ opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8;
+
+ M_Options_PrintSlider( " Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
+ M_Options_PrintCheckbox(" RT DLights", true, r_shadow_realtime_dlight.integer);
+ M_Options_PrintCheckbox(" RT DLight Shadows", true, r_shadow_realtime_dlight_shadows.integer);
+ M_Options_PrintCheckbox(" RT World", true, r_shadow_realtime_world.integer);
+ M_Options_PrintCheckbox("RT World DLight Shadows", true, r_shadow_realtime_world_dlightshadows.integer);
+ M_Options_PrintCheckbox(" RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.integer);
+ M_Options_PrintCheckbox(" RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
+}
+
+
+void M_Options_Graphics_Key (int k, char ascii)
+{
+ switch (k)
+ {
+ case K_ESCAPE:
+ M_Menu_Options_f ();
+ break;
+ case K_ENTER:
+ M_Menu_Options_Graphics_AdjustSliders (1);
+ break;
+
+ case K_UPARROW:
+ S_LocalSound ("misc/menu1.wav", true);
+ options_graphics_cursor--;
+ if (options_graphics_cursor < 0)
+ options_graphics_cursor = OPTIONS_GRAPHICS_ITEMS-1;
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("misc/menu1.wav", true);
+ options_graphics_cursor++;
+ if (options_graphics_cursor >= OPTIONS_GRAPHICS_ITEMS)
+ options_graphics_cursor = 0;
+ break;
+
+ case K_LEFTARROW:
+ M_Menu_Options_Graphics_AdjustSliders (-1);
+ break;
+
+ case K_RIGHTARROW:
+ M_Menu_Options_Graphics_AdjustSliders (1);
+ break;
+ }
+}
#define OPTIONS_COLORCONTROL_ITEMS 18
{
int optnum;
float f;
- S_LocalSound ("misc/menu3.wav");
+ S_LocalSound ("misc/menu3.wav", true);
optnum = 1;
if (options_colorcontrol_cursor == optnum++)
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;
if (bind_grab)
{ // defining a key
- S_LocalSound ("misc/menu1.wav");
+ S_LocalSound ("misc/menu1.wav", true);
if (k == K_ESCAPE)
{
bind_grab = false;
case K_LEFTARROW:
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav");
+ S_LocalSound ("misc/menu1.wav", true);
do
{
keys_cursor--;
case K_DOWNARROW:
case K_RIGHTARROW:
- S_LocalSound ("misc/menu1.wav");
+ S_LocalSound ("misc/menu1.wav", true);
do
{
keys_cursor++;
case K_ENTER: // go into bind mode
M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
- S_LocalSound ("misc/menu2.wav");
+ S_LocalSound ("misc/menu2.wav", true);
if (keys[NUMKEYS - 1] != -1)
M_UnbindCommand (bindnames[keys_cursor][0]);
bind_grab = true;
case K_BACKSPACE: // delete bindings
case K_DEL: // delete bindings
- S_LocalSound ("misc/menu2.wav");
+ S_LocalSound ("misc/menu2.wav", true);
M_UnbindCommand (bindnames[keys_cursor][0]);
break;
}
void M_Menu_Video_AdjustSliders (int dir)
{
- S_LocalSound ("misc/menu3.wav");
+ S_LocalSound ("misc/menu3.wav", true);
switch (video_cursor)
{
Cvar_SetValueQuick(&vid_height, current_vid_height);
Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel);
- S_LocalSound ("misc/menu1.wav");
+ S_LocalSound ("misc/menu1.wav", true);
M_Menu_Options_f ();
break;
break;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav");
+ S_LocalSound ("misc/menu1.wav", true);
video_cursor--;
if (video_cursor < 0)
video_cursor = VIDEO_ITEMS-1;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav");
+ S_LocalSound ("misc/menu1.wav", true);
video_cursor++;
if (video_cursor >= VIDEO_ITEMS)
video_cursor = 0;
if (request-- == 0) return M_QuitMessage("Your mech here is way more impressive","than your car out there...","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL);
if (request-- == 0) return M_QuitMessage("Quitting won't reduce your debt","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
break;
+ case GAME_OPENQUARTZ:
+ if (request-- == 0) return M_QuitMessage("There is nothing like free beer!","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("GNU is not Unix!","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("You prefer free beer over free speech?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Is OpenQuartz Propaganda?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
+ break;
default:
if (request-- == 0) return M_QuitMessage("Tired of fragging already?",NULL,NULL,NULL,NULL,NULL,NULL,NULL);
if (request-- == 0) return M_QuitMessage("Quit now and forfeit your bodycount?",NULL,NULL,NULL,NULL,NULL,NULL,NULL);
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;
{"e1m2", "Wrong Side of the Tracks"},
{"e1m7", "Altar of Stone"},
{"e2m8", "The Lair of Shial"},
+ {"e3m1", "Ghost Town"},
{"e3m7", "The Pit of Cerberus"},
{"e4m1", "Butchery Loves Company"},
{"e4m7", "In the Flesh"},
{"qbb1", "The Confluence"},
{"qbb2", "KathartiK"},
{"qbb3", "Caleb's Woodland Retreat"},
+ {"zoo", "Zoo"},
{"dranzbb6", "Black Coffee"},
{"fragm", "Frag'M"},
episode_t transfusionepisodes[] =
{
{"Blood", 0, 8},
- {"Blood Single Player", 8, 9},
- {"Plasma Pack", 17, 6},
- {"Cryptic Passage", 23, 2},
- {"Blood 2", 25, 5},
- {"Transfusion", 30, 8},
- {"Conversions", 38, 6}
+ {"Blood Single Player", 8, 10},
+ {"Plasma Pack", 18, 6},
+ {"Cryptic Passage", 24, 2},
+ {"Blood 2", 26, 5},
+ {"Transfusion", 31, 9},
+ {"Conversions", 40, 6}
};
level_t goodvsbad2levels[] =
{"Time for Battle", 0, 7},
};
+level_t openquartzlevels[] =
+{
+ {"start", "Welcome to Openquartz"},
+
+ {"void1", "The center of nowhere"}, // 1
+ {"void2", "The place with no name"},
+ {"void3", "The lost supply base"},
+ {"void4", "Past the outer limits"},
+ {"void5", "Into the nonexistance"},
+ {"void6", "Void walk"},
+
+ {"vtest", "Warp Central"},
+ {"box", "The deathmatch box"},
+ {"bunkers", "Void command"},
+ {"house", "House of chaos"},
+ {"office", "Overnight office kill"},
+ {"am1", "The nameless chambers"},
+};
+
+episode_t openquartzepisodes[] =
+{
+ {"Single Player", 0, 1},
+ {"Void Deathmatch", 1, 6},
+ {"Contrib", 7, 6},
+};
+
gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 7};
gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
+gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
typedef struct
{
{GAME_TRANSFUSION, &transfusiongame, &transfusiongame},
{GAME_GOODVSBAD2, &goodvsbad2game, &goodvsbad2game},
{GAME_BATTLEMECH, &battlemechgame, &battlemechgame},
+ {GAME_OPENQUARTZ, &openquartzgame, &openquartzgame},
{-1, &sharewarequakegame, ®isteredquakegame} // final fallback
};
double m_serverInfoMessageTime;
extern cvar_t sv_public;
+extern cvar_t sv_maxrate;
void M_Menu_GameOptions_f (void)
{
}
-int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 132, 152, 160};
-#define NUM_GAMEOPTIONS 11
+int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168};
+#define NUM_GAMEOPTIONS 12
int gameoptions_cursor;
void M_GameOptions_Draw (void)
M_Print(0, 104, " Public server");
M_Print(160, 104, (sv_public.integer == 0) ? "no" : "yes");
- M_Print(0, 120, " Server name");
- M_DrawTextBox (0, 124, 38, 1);
- M_Print(8, 132, hostname.string);
+ M_Print(0, 112, " Server maxrate");
+ M_Print(160, 112, va("%i", sv_maxrate.integer));
+
+ M_Print(0, 128, " Server name");
+ M_DrawTextBox (0, 132, 38, 1);
+ M_Print(8, 140, hostname.string);
g = lookupgameinfo();
if (gamemode != GAME_GOODVSBAD2)
{
- M_Print(0, 152, " Episode");
- M_Print(160, 152, g->episodes[startepisode].description);
+ M_Print(0, 160, " Episode");
+ M_Print(160, 160, 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, 168, " Level");
+ M_Print(160, 168, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
+ M_Print(160, 176, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
// line cursor
- if (gameoptions_cursor == 8)
+ if (gameoptions_cursor == 9)
M_DrawCharacter (8 + 8 * strlen(hostname.string), gameoptions_cursor_table[gameoptions_cursor], 10+((int)(realtime*4)&1));
else
M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1));
break;
case 8:
+ Cvar_SetValueQuick (&sv_maxrate, sv_maxrate.integer + dir*500);
+ if (sv_maxrate.integer > NET_MAXRATE)
+ Cvar_SetValueQuick (&sv_maxrate, NET_MAXRATE);
+ if (sv_maxrate.integer < NET_MINRATE)
+ Cvar_SetValueQuick (&sv_maxrate, NET_MINRATE);
break;
case 9:
+ break;
+
+ case 10:
if (gamemode == GAME_GOODVSBAD2)
break;
startepisode += dir;
startlevel = 0;
break;
- case 10:
+ case 11:
startlevel += dir;
g = lookupgameinfo();
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;
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)
break;
case K_BACKSPACE:
- if (gameoptions_cursor == 8)
+ if (gameoptions_cursor == 9)
{
l = strlen(hostname.string);
if (l)
default:
if (ascii < 32 || ascii > 126)
break;
- if (gameoptions_cursor == 8)
+ if (gameoptions_cursor == 9)
{
l = strlen(hostname.string);
if (l < 37)
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;
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;
void M_Init (void)
{
- menu_mempool = Mem_AllocPool("Menu");
+ menu_mempool = Mem_AllocPool("Menu", 0, NULL);
menuplyr_load = true;
menuplyr_pixels = NULL;
Cmd_AddCommand ("menu_setup", M_Menu_Setup_f);
Cmd_AddCommand ("menu_options", M_Menu_Options_f);
Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f);
+ Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f);
Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f);
Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
Cmd_AddCommand ("menu_keys", M_Menu_Keys_f);
M_Options_Effects_Draw ();
break;
+ case m_options_graphics:
+ M_Options_Graphics_Draw ();
+ break;
+
case m_options_colorcontrol:
M_Options_ColorControl_Draw ();
break;
if (m_entersound)
{
- S_LocalSound ("misc/menu2.wav");
+ S_LocalSound ("misc/menu2.wav", true);
m_entersound = false;
}
M_Options_Effects_Key (key, ascii);
return;
+ case m_options_graphics:
+ M_Options_Graphics_Key (key, ascii);
+ return;
+
case m_options_colorcontrol:
M_Options_ColorControl_Key (key, ascii);
return;
#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"
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);
// 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;
}
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);
+ prog->edicts_mempool = Mem_AllocPool(M_NAME " edicts mempool", 0, NULL);
+ prog->edictstring_mempool = Mem_AllocPool( M_NAME " edict string mempool", 0, NULL);
+ prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL);
PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func);
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;
{
// set router console commands
Cvar_RegisterVariable (&forceqmenu);
+ if (gamemode == GAME_NETHERWORLD)
+ Cmd_AddCommand ("menu_fallback", MP_Error); //Force to old-style menu
Cmd_AddCommand ("menu_restart",MR_Restart);
Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f);
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"))
+ if(COM_CheckParm("-useqmenu"))
MR_SetRouting (TRUE);
- else
+ else
MR_SetRouting (FALSE);
}
-
-
-
-
projects / xonotic / darkplaces.git / blobdiff