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);
}
-#define OPTIONS_ITEMS 37
+#define OPTIONS_ITEMS 38
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", 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 (&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_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_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);
M_Menu_Options_Effects_f ();
break;
case 5:
+ M_Menu_Options_Graphics_f ();
+ break;
+ case 6:
M_Menu_Options_ColorControl_f ();
break;
default:
}
+#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
{"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[] =
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;
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;
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;
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);
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);
}
-
-
-
-