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_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_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);
+ 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
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);
}
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);
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));
m_entersound = true;
}
-void M_Demo_Key (int k)
+void M_Demo_Key (int k, char ascii)
{
switch (k)
{
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;
}
-void M_Main_Key (int key)
+void M_Main_Key (int key, char ascii)
{
switch (key)
{
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)
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
{
}
-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)
{
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;
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));
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.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));
}
-void M_Load_Key (int k)
+void M_Load_Key (int k, char ascii)
{
switch (k)
{
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;
}
-void M_Save_Key (int k)
+void M_Save_Key (int k, char ascii)
{
switch (k)
{
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;
}
-void M_MultiPlayer_Key (int key)
+void M_MultiPlayer_Key (int key, char ascii)
{
switch (key)
{
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;
//=============================================================================
/* SETUP MENU */
-int setup_cursor = 3;
-int setup_cursor_table[] = {40, 64, 88, 124};
+int setup_cursor = 4;
+int setup_cursor_table[] = {40, 64, 88, 124, 140};
char setup_myname[32];
int setup_oldtop;
int setup_oldbottom;
int setup_top;
int setup_bottom;
+int setup_rate;
+int setup_oldrate;
-#define NUM_SETUP_CMDS 4
+#define NUM_SETUP_CMDS 5
void M_Menu_Setup_f (void)
{
strcpy(setup_myname, cl_name.string);
setup_top = setup_oldtop = cl_color.integer >> 4;
setup_bottom = setup_oldbottom = cl_color.integer & 15;
+ setup_rate = cl_rate.integer;
}
static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load;
static qbyte *menuplyr_pixels;
static unsigned int *menuplyr_translated;
+typedef struct ratetable_s
+{
+ int rate;
+ char *name;
+}
+ratetable_t;
+
+#define RATES ((int)(sizeof(setup_ratetable)/sizeof(setup_ratetable[0])))
+static ratetable_t setup_ratetable[] =
+{
+ {1000, "28.8 bad"},
+ {1500, "28.8 mediocre"},
+ {2000, "28.8 good"},
+ {2500, "33.6 mediocre"},
+ {3000, "33.6 good"},
+ {3500, "56k bad"},
+ {4000, "56k mediocre"},
+ {4500, "56k adequate"},
+ {5000, "56k good"},
+ {7000, "64k ISDN"},
+ {15000, "128k ISDN"},
+ {25000, "broadband"}
+};
+
+static int setup_rateindex(int rate)
+{
+ int i;
+ for (i = 0;i < RATES;i++)
+ if (setup_ratetable[i].rate > setup_rate)
+ break;
+ return bound(1, i, RATES) - 1;
+}
+
void M_Setup_Draw (void)
{
int i;
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_DrawTextBox (64, 124-8, 14, 1);
- M_Print (72, 124, "Accept Changes");
+ 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");
// LordHavoc: rewrote this code greatly
if (menuplyr_load)
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;
}
-void M_Setup_Key (int k)
+void M_Setup_Key (int k, char ascii)
{
int l;
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)
setup_bottom = setup_bottom - 1;
+ if (setup_cursor == 3)
+ {
+ l = setup_rateindex(setup_rate) - 1;
+ if (l < 0)
+ l = RATES - 1;
+ setup_rate = setup_ratetable[l].rate;
+ }
break;
case K_RIGHTARROW:
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)
setup_bottom = setup_bottom + 1;
+ if (setup_cursor == 3)
+ {
+ l = setup_rateindex(setup_rate) + 1;
+ if (l >= RATES)
+ l = 0;
+ setup_rate = setup_ratetable[l].rate;
+ }
break;
case K_ENTER:
if (setup_cursor == 0)
return;
- if (setup_cursor == 1 || setup_cursor == 2)
+ if (setup_cursor == 1 || setup_cursor == 2 || setup_cursor == 3)
goto forward;
- // setup_cursor == 3 (Accept changes)
+ // setup_cursor == 4 (Accept changes)
if (strcmp(cl_name.string, setup_myname) != 0)
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;
break;
default:
- if (k < 32 || k > 127)
+ if (ascii < 32 || ascii > 126)
break;
if (setup_cursor == 0)
{
if (l < 15)
{
setup_myname[l+1] = 0;
- setup_myname[l] = k;
+ setup_myname[l] = ascii;
}
}
}
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 32
+#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++)
+ Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1));
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&r_sky, !r_sky.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);
+ 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++)
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++)
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)
{
if (opty >= 32)
{
- DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ 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;
{
if (opty >= 32)
{
- DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ 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);
}
{
if (opty >= 32)
{
- DrawQ_Fill(menu_x, menu_y + opty, 640, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ 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);
}
p = Draw_CachePic("gfx/p_option.lmp");
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
- // 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?
optnum = 0;
optcursor = options_cursor;
visible = (vid.conheight - 32) / 8;
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.integer, 1, gl_max_anisotropy);
M_Options_PrintSlider( " Game Speed", sv.active, slowmo.value, 0, 5);
- M_Options_PrintSlider( " CD Music Volume", cdaudioinitialized, bgmvolume.value, 0, 1);
- M_Options_PrintSlider( " Sound Volume", snd_initialized, volume.value, 0, 1);
- M_Options_PrintSlider(gamemode == GAME_GOODVSBAD2 ? " Music Volume" : " Ambient Volume", snd_initialized, snd_staticvolume.value, 0, 1);
+ 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_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);
}
-void M_Options_Key (int k)
+void M_Options_Key (int k, char ascii)
{
switch (k)
{
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 20
+#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_bubbles;
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 (&r_coronas, !r_coronas.integer);
- 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 (&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 (&r_detailtextures, !r_detailtextures.integer);
- else if (options_effects_cursor == optnum++)
- Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
- else if (options_effects_cursor == optnum++)
- Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
- else if (options_effects_cursor == optnum++)
- Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
- else if (options_effects_cursor == optnum++)
- Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.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 (&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_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));
+ 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_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
+ 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_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 (&r_detailtextures, !r_detailtextures.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.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));
}
void M_Options_Effects_Draw (void)
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_PrintSlider( " Corona Intensity", true, r_coronas.value, 0, 4);
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(" 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_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);
}
-void M_Options_Effects_Key (int k)
+void M_Options_Effects_Key (int k, char ascii)
{
switch (k)
{
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++)
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, v_hwgamma.integer);
- M_Options_PrintSlider( " Gamma", !v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, v_gamma.value, 1, 5);
+ 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: 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 && v_hwgamma.integer, v_color_grey_r.value, 0, 0.95);
- M_Options_PrintSlider( " Grey: Green", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, v_color_grey_g.value, 0, 0.95);
- M_Options_PrintSlider( " Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer, v_color_grey_b.value, 0, 0.95);
- M_Options_PrintSlider( " Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported && 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( " 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);
}
-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:
Cvar_SetValueQuick(&v_color_white_r, 1);
Cvar_SetValueQuick(&v_color_white_g, 1);
Cvar_SetValueQuick(&v_color_white_b, 1);
- Cbuf_AddText ("exec default.cfg\n");
break;
default:
M_Menu_Options_ColorControl_AdjustSliders (1);
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;
{"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] =
count = 0;
- for (j=0 ; j<256 ; j++)
+ for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
{
- b = keybindings[j];
+ b = keybindings[0][j];
if (!b)
continue;
if (!strcmp (b, command) )
int j;
char *b;
- for (j=0 ; j<256 ; j++)
+ for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
{
- b = keybindings[j];
+ b = keybindings[0][j];
if (!b)
continue;
if (!strcmp (b, command))
- Key_SetBinding (j, "");
+ Key_SetBinding (j, 0, "");
}
}
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<numcommands ; i++)
continue;
}
else
- M_Print (16, y, bindnames[i][1]);
+ M_Print(16, y, bindnames[i][1]);
M_FindKeysForCommand (bindnames[i][0], keys);
}
}
}
- M_Print (150, y, keystring);
+ M_Print(150, y, keystring);
}
if (bind_grab)
}
-void M_Keys_Key (int k)
+void M_Keys_Key (int k, char ascii)
{
char cmd[80];
int keys[NUMKEYS];
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;
}
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;
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]);
}
// Resolution
M_Print(16, video_cursor_table[0], " Resolution");
string = va("%dx%d", video_resolutions[video_resolution][0], video_resolutions[video_resolution][1]);
- M_Print (220, video_cursor_table[0], string);
+ M_Print(220, video_cursor_table[0], string);
// Bits per pixel
M_Print(16, video_cursor_table[1], " Bits per pixel");
- M_Print (220, video_cursor_table[1], (vid_bitsperpixel.integer == 32) ? "32" : "16");
+ M_Print(220, video_cursor_table[1], (vid_bitsperpixel.integer == 32) ? "32" : "16");
// Fullscreen
M_Print(16, video_cursor_table[2], " Fullscreen");
void M_Menu_Video_AdjustSliders (int dir)
{
- S_LocalSound ("misc/menu3.wav");
+ S_LocalSound ("misc/menu3.wav", true);
switch (video_cursor)
{
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 - 1)
+ video_resolution = gamemode == GAME_FNIGGIUM ? VID_640 : 0;
else
video_resolution = new_resolution;
}
-void M_Video_Key (int key)
+void M_Video_Key (int key, char ascii)
{
switch (key)
{
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;
}
-void M_Help_Key (int key)
+void M_Help_Key (int key, char ascii)
{
switch (key)
{
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);
}
-void M_Quit_Key (int key)
+void M_Quit_Key (int key, char ascii)
{
switch (key)
{
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));
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);
}
-void M_LanConfig_Key (int key)
+void M_LanConfig_Key (int key, char ascii)
{
int l;
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;
break;
default:
- if (key < 32 || key > 127)
+ if (ascii < 32 || ascii > 126)
break;
if (lanConfig_cursor == 2)
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)
{
if (l < 5)
{
lanConfig_portname[l+1] = 0;
- lanConfig_portname[l] = key;
+ lanConfig_portname[l] = ascii;
}
}
}
{"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"},
{"e4m8", "The Hall of the Epiphany"},
{"e4m9", "Mall of the Dead"},
{"dm3", "Area 15"},
{"e6m1", "Welcome to Your Life"},
{"e6m8", "Beauty and the Beast"},
+ {"e6m9", "Forgotten Catacombs"},
{"cpbb01", "Crypt of Despair"},
{"cpbb03", "Unholy Cathedral"},
{"crypt", "The Crypt"},
{"bb3_2k1", "Bodies Infusion"},
+ {"captasao", "Captasao"},
+ {"curandero", "Curandero"},
{"dcamp", "DeathCamp"},
{"highnoon", "HighNoon"},
{"qbb1", "The Confluence"},
{"qbb2", "KathartiK"},
{"qbb3", "Caleb's Woodland Retreat"},
+ {"zoo", "Zoo"},
{"dranzbb6", "Black Coffee"},
{"fragm", "Frag'M"},
{"maim", "Maim"},
{"qe1m7", "The House of Chthon"},
+ {"qmorbias", "Dm-Morbias"},
{"simple", "Dead Simple"}
};
episode_t transfusionepisodes[] =
{
{"Blood", 0, 8},
- {"Blood Single Player", 8, 7},
- {"Plasma Pack", 15, 5},
- {"Cryptic Passage", 20, 2},
- {"Blood 2", 22, 5},
- {"Transfusion", 27, 6},
- {"Conversions", 33, 5}
+ {"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_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;
case 6: msg = "Three Team CTF"; break;
default: msg = "Off"; break;
}
- M_Print (160, 72, msg);
+ M_Print(160, 72, msg);
}
else
{
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_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));
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;
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();
}
}
-void M_GameOptions_Key (int key)
+void M_GameOptions_Key (int key, char ascii)
{
gamelevels_t *g;
int l;
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)
break;
default:
- if (key < 32 || key > 127)
+ if (ascii < 32 || ascii > 126)
break;
- if (gameoptions_cursor == 8)
+ if (gameoptions_cursor == 9)
{
l = strlen(hostname.string);
if (l < 37)
{
memcpy(hostnamebuf, hostname.string, l);
- hostnamebuf[l] = key;
+ hostnamebuf[l] = ascii;
hostnamebuf[l+1] = 0;
Cvar_Set("hostname", hostnamebuf);
}
}
-void M_ServerList_Key(int k)
+void M_ServerList_Key(int k, char ascii)
{
switch (k)
{
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;
//=============================================================================
/* Menu Subsystem */
-void M_Keydown(int key);
+void M_Keydown(int key, char ascii);
void M_Draw(void);
void M_ToggleMenu_f(void);
void M_Shutdown(void);
void M_Init (void)
{
- menu_mempool = Mem_AllocPool("Menu");
+ menu_mempool = Mem_AllocPool("Menu", 0, NULL);
menuplyr_load = true;
menuplyr_pixels = NULL;
- Cmd_AddCommand ("togglemenu", M_ToggleMenu_f);
-
Cmd_AddCommand ("menu_main", M_Menu_Main_f);
Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f);
Cmd_AddCommand ("menu_load", M_Menu_Load_f);
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);
{
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;
}
}
{
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...
}
}
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;
}
}
-void M_Keydown (int key)
+void M_Keydown (int key, char ascii)
{
switch (m_state)
{
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_graphics:
+ M_Options_Graphics_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)
#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);
// fall back to the normal menu
// say it
- Con_Printf("Falling back to normal menu.\n Error :");
+ Con_Print("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)
+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;
- PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key) required\n");
+ 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;
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
+ // 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;
}
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 :
-/* // free mempools
- Mem_FreePool(prog->edicts_mempool);
- Mem_FreePool(prog->edictstring_mempool);
- Mem_FreePool(prog->progs_mempool);*/
PRVM_ResetProg();
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;
+
// call the prog init
PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_INIT) - prog->functions),"");
-
+
PRVM_End;
}
void MP_Restart(void)
{
+
MP_Init();
}
MR_Draw = M_Draw;
MR_ToggleMenu_f = M_ToggleMenu_f;
MR_Shutdown = M_Shutdown;
-
+
// init
if(!m_init)
{
MR_Draw = MP_Draw;
MR_ToggleMenu_f = MP_ToggleMenu_f;
MR_Shutdown = MP_Shutdown;
-
+
if(!mp_init)
{
MP_Init();
MR_SetRouting (FALSE);
}
+void Call_MR_ToggleMenu_f(void)
+{
+ if(MR_ToggleMenu_f)
+ MR_ToggleMenu_f();
+}
+
void MR_Init()
{
// 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);
+ // use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1)
if(COM_CheckParm("-forceqmenu"))
Cvar_SetValueQuick(&forceqmenu,1);
-
- Cmd_AddCommand ("menu_restart",MR_Restart);
-
- MR_SetRouting (FALSE);
+ // use -useqmenu for debugging proposes, cause it starts
+ // the normal quake menu only the first time
+ if(COM_CheckParm("-useqmenu"))
+ MR_SetRouting (TRUE);
+ else
+ MR_SetRouting (FALSE);
}
-
-
-
-
projects / xonotic / darkplaces.git / blobdiff