else
MAIN_ITEMS = 6;
}
+ else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
+ MAIN_ITEMS = 6;
else
MAIN_ITEMS = 5;
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)
}
-#define OPTIONS_ITEMS 38
+#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)
{
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 (&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(1, gl_texture_anisotropy.integer + dir, gl_max_anisotropy));
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_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_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.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);
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;
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);
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);
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_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)
void M_Init (void)
{
- menu_mempool = Mem_AllocPool("Menu");
+ menu_mempool = Mem_AllocPool("Menu", 0, NULL);
menuplyr_load = true;
menuplyr_pixels = NULL;
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);
{
// 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);
-
- MR_SetRouting (FALSE);
+ else
+ MR_SetRouting (FALSE);
}
-
-
-
-
projects / xonotic / darkplaces.git / blobdiff