#include "quakedef.h"
#include "image.h"
+#include "mprogdefs.h"
#define TYPE_DEMO 1
#define TYPE_GAME 2
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_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
menu_height = height;
menu_x = (vid.conwidth - menu_width) * 0.5;
menu_y = (vid.conheight - menu_height) * 0.5;
- DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
- //DrawQ_Fill(0, 0, vid.conwidth, vid.conheight, 0, 0, 0, 0.5, 0);
+ //DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
+ DrawQ_Fill(0, 0, vid.conwidth, vid.conheight, 0, 0, 0, 0.5, 0);
}
/*
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
}
-void M_PrintWhite (float cx, float cy, const char *str)
+void M_PrintRed (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)
m_entersound = true;
}
-void M_Demo_Key (int k)
+void M_Demo_Key (int k, char ascii)
{
switch (k)
{
S_LocalSound ("misc/menu1.wav");
demo_cursor--;
if (demo_cursor < 0)
- demo_cursor = NumberOfNehahraDemos;
+ demo_cursor = NumberOfNehahraDemos-1;
break;
case K_DOWNARROW:
case K_RIGHTARROW:
S_LocalSound ("misc/menu1.wav");
demo_cursor++;
- if (demo_cursor > NumberOfNehahraDemos)
+ if (demo_cursor >= NumberOfNehahraDemos)
demo_cursor = 0;
break;
}
}
-void M_Main_Key (int key)
+void M_Main_Key (int key, char ascii)
{
switch (key)
{
p = Draw_CachePic ("gfx/ttl_sgl.lmp");
// Transfusion doesn't have a single player mode
- if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2)
+ if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
{
M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl.lmp");
M_DrawTextBox (60, 8 * 8, 23, 4);
if (gamemode == GAME_NEXUIZ)
- M_PrintWhite (95, 10 * 8, "Nexuiz is for");
+ M_Print (95, 10 * 8, "Nexuiz is for");
else if (gamemode == GAME_GOODVSBAD2)
- M_PrintWhite (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");
else
- M_PrintWhite (95, 10 * 8, "Transfusion is for");
- M_PrintWhite (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)
+ if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
{
if (key == K_ESCAPE || key == K_ENTER)
m_state = m_main;
str = FS_Getline (f);
sscanf (str, "%i\n", &version);
str = FS_Getline (f);
- strncpy (m_filenames[i], str, sizeof(m_filenames[i])-1);
+ strlcpy (m_filenames[i], str, sizeof (m_filenames[i]));
// change _ back to space
for (j=0 ; j<SAVEGAME_COMMENT_LENGTH ; j++)
return;
if (cl.intermission)
return;
- if (svs.maxclients != 1)
+ if (!cl.islocalgame)
return;
m_entersound = true;
m_state = m_save;
}
-void M_Load_Key (int k)
+void M_Load_Key (int k, char ascii)
{
switch (k)
{
}
-void M_Save_Key (int k)
+void M_Save_Key (int k, char ascii)
{
switch (k)
{
}
-void M_MultiPlayer_Key (int key)
+void M_MultiPlayer_Key (int key, char ascii)
{
switch (key)
{
}
-void M_Setup_Key (int k)
+void M_Setup_Key (int k, char ascii)
{
int l;
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;
}
}
}
M_DrawCharacter (x + i*8, y, 129);
M_DrawCharacter (x+i*8, y, 130);
M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131);
- sprintf(text, "%g", num);
+ if (fabs((int)num - num) < 0.01)
+ sprintf(text, "%i", (int)num);
+ else
+ sprintf(text, "%.2f", num);
M_Print(x + (SLIDER_RANGE+2) * 8, y, text);
}
}
-#define OPTIONS_ITEMS 29
+#define OPTIONS_ITEMS 33
int options_cursor;
extern cvar_t gl_delayfinish;
extern cvar_t slowmo;
extern dllhandle_t jpeg_dll;
+extern cvar_t gl_texture_anisotropy;
void M_Menu_Options_AdjustSliders (int dir)
{
+ int optnum;
S_LocalSound ("misc/menu3.wav");
- switch (options_cursor)
- {
- case 6:
- Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
- break;
- case 7:
+ optnum = 6;
+ if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&vid_conwidth, bound(320, vid_conwidth.value + dir * 64, 2048));
+ else if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&vid_conheight, bound(240, vid_conheight.value + dir * 48, 1536));
+ else if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&scr_conspeed, bound(0, scr_conspeed.value + dir * 100, 1000));
+ 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 (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
- break;
- case 8:
- if (jpeg_dll != NULL)
- Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer);
- break;
- case 9:
+ else if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer);
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&r_sky, !r_sky.integer);
- break;
- case 10:
- Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
- break;
- case 11:
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
- break;
- case 12:
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
- break;
- case 13:
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer);
- break;
- case 14:
+ else if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&gl_texture_anisotropy, bound(0, gl_texture_anisotropy.value + dir, 8));
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
- break;
- case 15: // music volume
- #ifdef _WIN32
+ else if (options_cursor == optnum++)
+#ifdef _WIN32
Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 1.0, 1));
- #else
+#else
Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1));
- #endif
- break;
- case 16: // sfx volume
+#endif
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
- break;
- case 17: // static volume
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&snd_staticvolume, bound(0, snd_staticvolume.value + dir * 0.1, 1));
- break;
- case 18:
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5));
- break;
- case 19:
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
- break;
- case 20: // static crosshair
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer);
- break;
- case 21: // show framerate
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&showfps, !showfps.integer);
- break;
- case 22: // always run
+ else if (options_cursor == optnum++)
+ {
if (cl_forwardspeed.value > 200)
{
Cvar_SetValueQuick (&cl_forwardspeed, 200);
Cvar_SetValueQuick (&cl_forwardspeed, 400);
Cvar_SetValueQuick (&cl_backspeed, 400);
}
- break;
- case 23: // lookspring
+ }
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&lookspring, !lookspring.integer);
- break;
- case 24: // lookstrafe
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
- break;
- case 25: // mouse speed
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
- break;
- case 26: // mouse look
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&freelook, !freelook.integer);
- break;
- case 27: // invert mouse
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
- break;
- case 28: // windowed mouse
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
- break;
+}
+
+int optnum;
+int opty;
+int optcursor;
+
+void M_Options_PrintCommand(char *s, int enabled)
+{
+ if (opty >= 32)
+ {
+ 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;
+ optnum++;
+}
+
+void M_Options_PrintCheckbox(char *s, int enabled, int yes)
+{
+ if (opty >= 32)
+ {
+ 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);
+ }
+ opty += 8;
+ optnum++;
+}
+
+void M_Options_PrintSlider(char *s, int enabled, float value, float minvalue, float maxvalue)
+{
+ if (opty >= 32)
+ {
+ 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);
+ }
+ opty += 8;
+ optnum++;
}
void M_Options_Draw (void)
{
- float y;
+ int visible;
cachepic_t *p;
M_Background(320, 240);
p = Draw_CachePic("gfx/p_option.lmp");
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
- y = 32;
- M_Print(16, y, " Customize controls");y += 8;
- M_Print(16, y, " Go to console");y += 8;
- M_Print(16, y, " Reset to defaults");y += 8;
- M_Print(16, y, " Video Options");y += 8;
- M_Print(16, y, " Effects Options");y += 8;
- M_Print(16, y, " Color Control Options");y += 8;
- M_Print(16, y, " 2D Resolution");M_DrawSlider(220, y, scr_2dresolution.value, 0, 1);y += 8;
- M_Print(16, y, " Screen size");M_DrawSlider(220, y, scr_viewsize.value, 30, 120);y += 8;
- M_ItemPrint(16, y, " JPEG screenshots", jpeg_dll != NULL);M_DrawCheckbox(220, y, scr_screenshot_jpeg.integer);y += 8;
- M_Print(16, y, " Sky");M_DrawCheckbox(220, y, r_sky.integer);y += 8;
// 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?
- M_Print(16, y, " Overbright Bits");M_DrawSlider(220, y, v_overbrightbits.value, 0, 4);y += 8;
- M_Print(16, y, " Texture Combine");M_DrawCheckbox(220, y, gl_combine.integer);y += 8;
- M_Print(16, y, " Dithering");M_DrawCheckbox(220, y, gl_dither.integer);y += 8;
- M_Print(16, y, "Delay refresh (faster)");M_DrawCheckbox(220, y, gl_delayfinish.integer);y += 8;
- M_ItemPrint(16, y, " Game Speed", sv.active);M_DrawSlider(220, y, slowmo.value, 0, 5);y += 8;
- M_ItemPrint(16, y, " CD Music Volume", cdaudioinitialized);M_DrawSlider(220, y, bgmvolume.value, 0, 1);y += 8;
- M_ItemPrint(16, y, " Sound Volume", snd_initialized);M_DrawSlider(220, y, volume.value, 0, 1);y += 8;
- if (gamemode == GAME_GOODVSBAD2)
- M_ItemPrint(16, y, " Music Volume", snd_initialized);
- else
- M_ItemPrint(16, y, " Ambient Sound Volume", snd_initialized);
- M_DrawSlider(220, y, snd_staticvolume.value, 0, 1);
- y += 8;
- M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value, 0, 5);y += 8;
- M_Print(16, y, " Crosshair Size");M_DrawSlider(220, y, crosshair_size.value, 1, 5);y += 8;
- M_Print(16, y, " Static Crosshair");M_DrawCheckbox(220, y, crosshair_static.integer);y += 8;
- M_Print(16, y, " Show Framerate");M_DrawCheckbox(220, y, showfps.integer);y += 8;
- M_Print(16, y, " Always Run");M_DrawCheckbox(220, y, cl_forwardspeed.value > 200);y += 8;
- M_Print(16, y, " Lookspring");M_DrawCheckbox(220, y, lookspring.integer);y += 8;
- M_Print(16, y, " Lookstrafe");M_DrawCheckbox(220, y, lookstrafe.integer);y += 8;
- M_Print(16, y, " Mouse Speed");M_DrawSlider(220, y, sensitivity.value, 1, 50);y += 8;
- M_Print(16, y, " Mouse Look");M_DrawCheckbox(220, y, freelook.integer);y += 8;
- M_Print(16, y, " Invert Mouse");M_DrawCheckbox(220, y, m_pitch.value < 0);y += 8;
- M_Print(16, y, " Use Mouse");M_DrawCheckbox(220, y, vid_mouse.integer);y += 8;
-
- // cursor
- M_DrawCharacter(200, 32 + options_cursor*8, 12+((int)(realtime*4)&1));
-}
-
-
-void M_Options_Key (int k)
+ optnum = 0;
+ optcursor = options_cursor;
+ visible = (vid.conheight - 32) / 8;
+ opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8;
+
+ M_Options_PrintCommand( "Customize controls", true);
+ M_Options_PrintCommand( " Go to console", true);
+ M_Options_PrintCommand( " Reset to defaults", true);
+ M_Options_PrintCommand( " Video", true);
+ M_Options_PrintCommand( " Effects", 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( " Screen size", true, scr_viewsize.value, 30, 120);
+ 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.value, 0, 8);
+ 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( " 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(" Always Run", true, cl_forwardspeed.value > 200);
+ M_Options_PrintCheckbox(" Lookspring", true, lookspring.integer);
+ M_Options_PrintCheckbox(" Lookstrafe", true, lookstrafe.integer);
+ M_Options_PrintSlider( " Mouse Speed", true, sensitivity.value, 1, 50);
+ M_Options_PrintCheckbox(" Mouse Look", true, freelook.integer);
+ M_Options_PrintCheckbox(" Invert Mouse", true, m_pitch.value < 0);
+ M_Options_PrintCheckbox(" Use Mouse", true, vid_mouse.integer);
+}
+
+
+void M_Options_Key (int k, char ascii)
{
switch (k)
{
}
}
-#define OPTIONS_EFFECTS_ITEMS 16
+#define OPTIONS_EFFECTS_ITEMS 20
int options_effects_cursor;
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 r_dlightmap;
extern cvar_t r_modellights;
extern cvar_t r_coronas;
extern cvar_t gl_flashblend;
+extern cvar_t cl_particles_quality;
extern cvar_t cl_particles_bulletimpacts;
extern cvar_t cl_particles_smoke;
extern cvar_t cl_particles_sparks;
extern cvar_t cl_particles_bubbles;
extern cvar_t cl_particles_blood;
-extern cvar_t cl_particles_blood_size;
extern cvar_t cl_particles_blood_alpha;
void M_Menu_Options_Effects_AdjustSliders (int dir)
{
+ int optnum;
S_LocalSound ("misc/menu3.wav");
- switch (options_effects_cursor)
- {
- case 0:
+ optnum = 0;
+ if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
- break;
- case 1:
- Cvar_SetValueQuick (&r_dlightmap, !r_dlightmap.integer);
- break;
- case 2:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&r_coronas, !r_coronas.integer);
- break;
- case 3:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
- break;
- case 4:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
- break;
- case 5:
+ 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);
- break;
- case 6:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
- break;
- case 7:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
- break;
- case 8:
+ 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);
- break;
- case 9:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
- break;
- case 10:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
- break;
- case 11:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
- break;
- case 12:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
- break;
- case 13:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
- break;
- case 14:
- Cvar_SetValueQuick (&cl_particles_blood_size, bound(2, cl_particles_blood_size.value + dir * 1, 20));
- break;
- case 15:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
- break;
- }
+ 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));
}
void M_Options_Effects_Draw (void)
{
- float y;
+ int visible;
cachepic_t *p;
M_Background(320, 200);
p = Draw_CachePic("gfx/p_option.lmp");
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
- y = 32;
- M_Print(16, y, " Lights Per Model");M_DrawSlider(220, y, r_modellights.value, 0, 8);y += 8;
- M_Print(16, y, " Fast Dynamic Lighting");M_DrawCheckbox(220, y, !r_dlightmap.integer);y += 8;
- M_Print(16, y, " Coronas");M_DrawCheckbox(220, y, r_coronas.integer);y += 8;
- M_Print(16, y, " Use Only Coronas");M_DrawCheckbox(220, y, gl_flashblend.integer);y += 8;
- M_Print(16, y, " Particles");M_DrawCheckbox(220, y, cl_particles.integer);y += 8;
- M_Print(16, y, " Explosions");M_DrawCheckbox(220, y, cl_explosions.integer);y += 8;
- M_Print(16, y, " Explosion Clipping");M_DrawCheckbox(220, y, r_explosionclip.integer);y += 8;
- M_Print(16, y, " Stainmaps");M_DrawCheckbox(220, y, cl_stainmaps.integer);y += 8;
- M_Print(16, y, " Detail Texturing");M_DrawCheckbox(220, y, r_detailtextures.integer);y += 8;
- M_Print(16, y, " Bullet Impacts");M_DrawCheckbox(220, y, cl_particles_bulletimpacts.integer);y += 8;
- M_Print(16, y, " Smoke");M_DrawCheckbox(220, y, cl_particles_smoke.integer);y += 8;
- M_Print(16, y, " Sparks");M_DrawCheckbox(220, y, cl_particles_sparks.integer);y += 8;
- M_Print(16, y, " Bubbles");M_DrawCheckbox(220, y, cl_particles_bubbles.integer);y += 8;
- M_Print(16, y, " Blood");M_DrawCheckbox(220, y, cl_particles_blood.integer);y += 8;
- M_Print(16, y, " Blood Size");M_DrawSlider(220, y, cl_particles_blood_size.value, 2, 20);y += 8;
- M_Print(16, y, " Blood Opacity");M_DrawSlider(220, y, cl_particles_blood_alpha.value, 0.2, 1);y += 8;
-
- // cursor
- M_DrawCharacter(200, 32 + options_effects_cursor*8, 12+((int)(realtime*4)&1));
-}
-
-
-void M_Options_Effects_Key (int k)
+ optcursor = options_effects_cursor;
+ optnum = 0;
+ visible = (vid.conheight - 32) / 8;
+ 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_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(" 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(" Bullet Impacts", true, cl_particles_bulletimpacts.integer);
+ M_Options_PrintCheckbox(" Smoke", true, cl_particles_smoke.integer);
+ M_Options_PrintCheckbox(" Sparks", true, cl_particles_sparks.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(" Model Interpolation", true, r_lerpmodels.integer);
+ M_Options_PrintCheckbox(" Sprite Interpolation", true, r_lerpsprites.integer);
+ 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, char ascii)
{
switch (k)
{
void M_Menu_Options_ColorControl_AdjustSliders (int dir)
{
+ int optnum;
float f;
S_LocalSound ("misc/menu3.wav");
- switch (options_colorcontrol_cursor)
- {
- case 1:
+ optnum = 1;
+ if (options_colorcontrol_cursor == optnum++)
Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
- break;
- case 2:
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 0);
Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.125, 5));
- break;
- case 3:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 0);
Cvar_SetValueQuick (&v_contrast, bound(1, v_contrast.value + dir * 0.125, 5));
- break;
- case 4:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 0);
Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8));
- break;
- case 5:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, !v_color_enable.integer);
- break;
- case 6:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
Cvar_SetValueQuick (&v_color_black_r, bound(0, v_color_black_r.value + dir * 0.0125, 0.8));
- break;
- case 7:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
Cvar_SetValueQuick (&v_color_black_g, bound(0, v_color_black_g.value + dir * 0.0125, 0.8));
- break;
- case 8:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
Cvar_SetValueQuick (&v_color_black_b, bound(0, v_color_black_b.value + dir * 0.0125, 0.8));
- break;
- case 9:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
f = bound(0, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3 + dir * 0.0125, 0.8);
Cvar_SetValueQuick (&v_color_black_r, f);
Cvar_SetValueQuick (&v_color_black_g, f);
Cvar_SetValueQuick (&v_color_black_b, f);
- break;
- case 10:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
Cvar_SetValueQuick (&v_color_grey_r, bound(0, v_color_grey_r.value + dir * 0.0125, 0.95));
- break;
- case 11:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
Cvar_SetValueQuick (&v_color_grey_g, bound(0, v_color_grey_g.value + dir * 0.0125, 0.95));
- break;
- case 12:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
Cvar_SetValueQuick (&v_color_grey_b, bound(0, v_color_grey_b.value + dir * 0.0125, 0.95));
- break;
- case 13:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
f = bound(0, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3 + dir * 0.0125, 0.95);
Cvar_SetValueQuick (&v_color_grey_r, f);
Cvar_SetValueQuick (&v_color_grey_g, f);
Cvar_SetValueQuick (&v_color_grey_b, f);
- break;
- case 14:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
Cvar_SetValueQuick (&v_color_white_r, bound(1, v_color_white_r.value + dir * 0.125, 5));
- break;
- case 15:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
Cvar_SetValueQuick (&v_color_white_g, bound(1, v_color_white_g.value + dir * 0.125, 5));
- break;
- case 16:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
Cvar_SetValueQuick (&v_color_white_b, bound(1, v_color_white_b.value + dir * 0.125, 5));
- break;
- case 17:
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
Cvar_SetValueQuick (&v_color_enable, 1);
f = bound(1, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3 + dir * 0.125, 5);
Cvar_SetValueQuick (&v_color_white_r, f);
Cvar_SetValueQuick (&v_color_white_g, f);
Cvar_SetValueQuick (&v_color_white_b, f);
- break;
}
}
void M_Options_ColorControl_Draw (void)
{
- float x, y, c, s, t, u, v;
+ int visible;
+ float x, c, s, t, u, v;
cachepic_t *p;
M_Background(320, 256);
p = Draw_CachePic("gfx/p_option.lmp");
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
- y = 32;
- M_Print(16, y, " Reset to defaults");y += 8;
- M_ItemPrint(16, y, "Hardware Gamma Control", vid_hardwaregammasupported);M_DrawCheckbox(220, y, v_hwgamma.integer);y += 8;
- M_ItemPrint(16, y, " Gamma", !v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_gamma.value, 1, 5);y += 8;
- M_ItemPrint(16, y, " Contrast", !v_color_enable.integer);M_DrawSlider(220, y, v_contrast.value, 1, 5);y += 8;
- M_ItemPrint(16, y, " Brightness", !v_color_enable.integer);M_DrawSlider(220, y, v_brightness.value, 0, 0.8);y += 8;
- M_Print(16, y, " Color Level Controls");M_DrawCheckbox(220, y, v_color_enable.integer);y += 8;
- M_ItemPrint(16, y, " Black: Red ", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_r.value, 0, 0.8);y += 8;
- M_ItemPrint(16, y, " Black: Green", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_g.value, 0, 0.8);y += 8;
- M_ItemPrint(16, y, " Black: Blue ", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_b.value, 0, 0.8);y += 8;
- M_ItemPrint(16, y, " Black: Grey ", v_color_enable.integer);M_DrawSlider(220, y, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3, 0, 0.8);y += 8;
- M_ItemPrint(16, y, " Grey: Red ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_r.value, 0, 0.95);y += 8;
- M_ItemPrint(16, y, " Grey: Green", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_g.value, 0, 0.95);y += 8;
- M_ItemPrint(16, y, " Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_b.value, 0, 0.95);y += 8;
- M_ItemPrint(16, y, " Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3, 0, 0.95);y += 8;
- M_ItemPrint(16, y, " White: Red ", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_r.value, 1, 5);y += 8;
- M_ItemPrint(16, y, " White: Green", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_g.value, 1, 5);y += 8;
- M_ItemPrint(16, y, " White: Blue ", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_b.value, 1, 5);y += 8;
- M_ItemPrint(16, y, " White: Grey ", v_color_enable.integer);M_DrawSlider(220, y, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3, 1, 5);y += 8;
-
- y += 4;
- DrawQ_Fill(menu_x, menu_y + y, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);y += 4;
+ optcursor = options_colorcontrol_cursor;
+ optnum = 0;
+ visible = (vid.conheight - 32) / 8;
+ 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.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: Red ", v_color_enable.integer, v_color_black_r.value, 0, 0.8);
+ 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.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);
+ M_Options_PrintSlider( " White: Grey ", v_color_enable.integer, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3, 1, 5);
+
+ opty += 4;
+ DrawQ_Fill(menu_x, menu_y + opty, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);opty += 4;
s = (float) 312 / 2 * vid.realwidth / vid.conwidth;
t = (float) 4 / 2 * vid.realheight / vid.conheight;
- DrawQ_SuperPic(menu_x + 4, menu_y + y, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);y += 4;
- DrawQ_SuperPic(menu_x + 4, menu_y + y, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,0,0,1, 0,1, 0,0,0,1, 1,1, 1,0,0,1, 0);y += 4;
- DrawQ_SuperPic(menu_x + 4, menu_y + y, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);y += 4;
- DrawQ_SuperPic(menu_x + 4, menu_y + y, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,1,0,1, 0,1, 0,0,0,1, 1,1, 0,1,0,1, 0);y += 4;
- DrawQ_SuperPic(menu_x + 4, menu_y + y, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);y += 4;
- DrawQ_SuperPic(menu_x + 4, menu_y + y, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,0,1,1, 0,1, 0,0,0,1, 1,1, 0,0,1,1, 0);y += 4;
- DrawQ_SuperPic(menu_x + 4, menu_y + y, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);y += 4;
- DrawQ_SuperPic(menu_x + 4, menu_y + y, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,1,1,1, 0,1, 0,0,0,1, 1,1, 1,1,1,1, 0);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);opty += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,0,0,1, 0,1, 0,0,0,1, 1,1, 1,0,0,1, 0);opty += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);opty += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,1,0,1, 0,1, 0,0,0,1, 1,1, 0,1,0,1, 0);opty += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);opty += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,0,1,1, 0,1, 0,0,0,1, 1,1, 0,0,1,1, 0);opty += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);opty += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,1,1,1, 0,1, 0,0,0,1, 1,1, 1,1,1,1, 0);opty += 4;
c = menu_options_colorcontrol_correctionvalue.value; // intensity value that should be matched up to a 50% dither to 'correct' quake
s = (float) 48 / 2 * vid.realwidth / vid.conwidth;
t = (float) 48 / 2 * vid.realheight / vid.conheight;
u = s * 0.5;
v = t * 0.5;
- y += 8;
+ opty += 8;
x = 4;
- DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, c, 0, 0, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0);
+ DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, 0, 0, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0);
x += 80;
- DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, 0, c, 0, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0);
+ DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, c, 0, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0);
x += 80;
- DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, 0, 0, c, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0);
+ DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, 0, c, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0);
x += 80;
- DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, c, c, c, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0);
-
- // cursor
- M_DrawCharacter(200, 32 + options_colorcontrol_cursor*8, 12+((int)(realtime*4)&1));
+ DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, c, c, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0);
}
-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:
char *transfusionbindnames[][2] =
{
+{"", "Movement"}, // Movement commands
{"+forward", "walk forward"},
{"+back", "backpedal"},
{"+left", "turn left"},
{"+moveright", "step right"},
{"+jump", "jump / swim up"},
{"+movedown", "swim down"},
-{"+attack", "attack"},
-{"+button3", "altfire"},
+{"", "Combat"}, // Combat commands
{"impulse 1", "Pitch Fork"},
{"impulse 2", "Flare Gun"},
{"impulse 3", "Shotgun"},
{"impulse 4", "Machine Gun"},
{"impulse 5", "Incinerator"},
-{"impulse 6", "Bombs"},
+{"impulse 6", "Bombs (TNT)"},
+{"impulse 35", "Proximity Bomb"},
+{"impulse 36", "Remote Detonator"},
{"impulse 7", "Aerosol Can"},
{"impulse 8", "Tesla Cannon"},
{"impulse 9", "Life Leech"},
-{"impulse 17", "Voodoo Doll"},
-{"impulse 11", "previous weapon"},
-{"impulse 10", "next weapon"},
-{"impulse 14", "previous item"},
-{"impulse 15", "next item"},
-{"impulse 13", "use item"},
-{"impulse 100", "add bot (red)"},
-{"impulse 101", "add bot (blue)"},
-{"impulse 102", "kick a bot"},
-{"impulse 50", "voting menu"},
-{"impulse 141", "identify player"},
-{"impulse 16", "next armor type"},
-{"impulse 20", "observer mode"}
+{"impulse 10", "Voodoo Doll"},
+{"impulse 21", "next weapon"},
+{"impulse 22", "previous weapon"},
+{"+attack", "attack"},
+{"+button3", "altfire"},
+{"", "Inventory"}, // Inventory commands
+{"impulse 40", "Dr.'s Bag"},
+{"impulse 41", "Crystal Ball"},
+{"impulse 42", "Beast Vision"},
+{"impulse 43", "Jump Boots"},
+{"impulse 23", "next item"},
+{"impulse 24", "previous item"},
+{"impulse 25", "use item"},
+{"", "Misc"}, // Misc commands
+{"+button4", "use"},
+{"impulse 50", "add bot (red)"},
+{"impulse 51", "add bot (blue)"},
+{"impulse 52", "kick a bot"},
+{"impulse 26", "next armor type"},
+{"impulse 27", "identify player"},
+{"impulse 55", "voting menu"},
+{"impulse 56", "observer mode"}
};
char *goodvsbad2bindnames[][2] =
cachepic_t *p;
char keystring[1024];
- M_Background(320, 200);
+ M_Background(320, 48 + 8 * numcommands);
p = Draw_CachePic ("gfx/ttl_cstm.lmp");
M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp");
{
y = 48 + 8*i;
- M_Print (16, y, bindnames[i][1]);
+ // If there's no command, it's just a section
+ if (bindnames[i][0][0] == '\0')
+ {
+ M_PrintRed (4, y, "\x0D"); // #13 is the little arrow pointing to the right
+ M_PrintRed (16, y, bindnames[i][1]);
+ continue;
+ }
+ else
+ M_Print (16, y, bindnames[i][1]);
M_FindKeysForCommand (bindnames[i][0], keys);
}
-void M_Keys_Key (int k)
+void M_Keys_Key (int k, char ascii)
{
char cmd[80];
int keys[NUMKEYS];
case K_LEFTARROW:
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
- keys_cursor--;
- if (keys_cursor < 0)
- keys_cursor = numcommands-1;
+ do
+ {
+ keys_cursor--;
+ if (keys_cursor < 0)
+ keys_cursor = numcommands-1;
+ }
+ while (bindnames[keys_cursor][0][0] == '\0'); // skip sections
break;
case K_DOWNARROW:
case K_RIGHTARROW:
S_LocalSound ("misc/menu1.wav");
- keys_cursor++;
- if (keys_cursor >= numcommands)
- keys_cursor = 0;
+ do
+ {
+ keys_cursor++;
+ if (keys_cursor >= numcommands)
+ keys_cursor = 0;
+ }
+ while (bindnames[keys_cursor][0][0] == '\0'); // skip sections
break;
case K_ENTER: // go into bind mode
//=============================================================================
/* VIDEO MENU */
-#define VIDEO_ITEMS 5
+#define VIDEO_ITEMS 4
int video_cursor = 0;
-int video_cursor_table[] = {56, 68, 80, 92, 116};
+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}};
+#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
int video_resolution;
extern int current_vid_fullscreen;
extern int current_vid_width;
extern int current_vid_height;
extern int current_vid_bitsperpixel;
-extern int current_vid_stencil;
void M_Menu_Video_f (void)
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)
}
// Default to 800x600 if we didn't find it
- if (video_resolution == sizeof (video_resolutions) / sizeof (video_resolutions[0]))
+ if (video_resolution == VID_RES_COUNT)
{
// may need to update this number if mode list changes
video_resolution = 4;
M_Print(16, video_cursor_table[2], " Fullscreen");
M_DrawCheckbox(220, video_cursor_table[2], vid_fullscreen.integer);
- // Stencil
- M_Print(16, video_cursor_table[3], " Stencil");
- M_DrawCheckbox(220, video_cursor_table[3], vid_stencil.integer);
-
// "Apply" button
- M_Print(220, video_cursor_table[4], "Apply");
+ M_Print(220, video_cursor_table[3], "Apply");
// Cursor
M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
{
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 = VID_RES_COUNT - 1;
+ else if (new_resolution > VID_RES_COUNT)
video_resolution = 0;
else
video_resolution = new_resolution;
case 2:
Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
break;
- case 3:
- Cvar_SetValueQuick (&vid_stencil, !vid_stencil.integer);
- break;
}
}
-void M_Video_Key (int key)
+void M_Video_Key (int key, char ascii)
{
switch (key)
{
Cvar_SetValueQuick(&vid_width, current_vid_width);
Cvar_SetValueQuick(&vid_height, current_vid_height);
Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel);
- Cvar_SetValueQuick(&vid_stencil, current_vid_stencil);
S_LocalSound ("misc/menu1.wav");
M_Menu_Options_f ();
m_entersound = true;
switch (video_cursor)
{
- case 4:
+ case 3:
Cbuf_AddText ("vid_restart\n");
M_Menu_Options_f ();
break;
}
-void M_Help_Key (int key)
+void M_Help_Key (int key, char ascii)
{
switch (key)
{
//=============================================================================
/* QUIT MENU */
-int msgNumber;
+char *m_quit_message[9];
int m_quit_prevstate;
qboolean wasInMenus;
-char *quitMessage [] =
+
+int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8)
{
-/* .........1.........2.... */
-/*
- " Are you gonna quit ",
- " this game just like ",
- " everything else? ",
- " ",
-
- " Milord, methinks that ",
- " thou art a lowly ",
- " quitter. Is this true? ",
- " ",
-
- " Do I need to bust your ",
- " face open for trying ",
- " to quit? ",
- " ",
-
- " Man, I oughta smack you",
- " for trying to quit! ",
- " Press Y to get ",
- " smacked out. ",
-
- " Press Y to quit like a ",
- " big loser in life. ",
- " Press N to stay proud ",
- " and successful! ",
-
- " If you press Y to ",
- " quit, I will summon ",
- " Satan all over your ",
- " hard drive! ",
-
- " Um, Asmodeus dislikes ",
- " his children trying to ",
- " quit. Press Y to return",
- " to your Tinkertoys. ",
-
- " If you quit now, I'll ",
- " throw a blanket-party ",
- " for you next time! ",
- " "
- */
-
-/* .........1.........2.... */
- " ",
- " Tired of fragging ",
- " already? ",
- " ",
-
- " ",
- " Quit now and forfeit ",
- " your bodycount? ",
- " ",
-
- " ",
- " Are you sure you ",
- " want to quit? ",
- " ",
-
- " ",
- " Off to do something ",
- " constructive? ",
- " ",
-};
+ m_quit_message[0] = line1;
+ m_quit_message[1] = line2;
+ m_quit_message[2] = line3;
+ m_quit_message[3] = line4;
+ m_quit_message[4] = line5;
+ m_quit_message[5] = line6;
+ m_quit_message[6] = line7;
+ m_quit_message[7] = line8;
+ m_quit_message[8] = NULL;
+ return 1;
+}
-char *goodvsbad2quitMessage [] =
-{
-/* .........1.........2.... */
- " Press Yes To Quit ",
- " ... ",
- " Yes ",
- " ",
-
- " Do you really want to ",
- " Quit? ",
- " Play Good vs bad 3! ",
- " ",
-
- " All your quit are ",
- " belong to long duck ",
- " dong ",
- " ",
-
- " Press Y to quit ",
- " ",
- " But are you too legit?",
- " ",
-
- " This game was made by ",
- " e@chip-web.com ",
- " It is by far the best ",
- " game ever made. ",
-
- " Even I really dont ",
- " know of a game better ",
- " Press Y to quit ",
- " like rougue chedder ",
-
- " After you stop playing",
- " tell the guys who made ",
- " counterstrike to just ",
- " kill themselves now ",
-
- " Press Y to exit to DOS",
- " ",
- " SSH login as user Y ",
- " to exit to Linux "
-
- " ",
- " Press Y like you ",
- " were waanderers ",
- " from Ys' ",
-
- " ",
- " This game was made in ",
- " Nippon like the SS ",
- " announcer's saying ipon",
-
- " ",
- " you ",
- " want to quit? ",
- " ",
-
- " ",
- " Please stop playing ",
- " this stupid game ",
- " ",
+int M_ChooseQuitMessage(int request)
+{
+ switch (gamemode)
+ {
+ case GAME_NORMAL:
+ case GAME_HIPNOTIC:
+ case GAME_ROGUE:
+ case GAME_NEHAHRA:
+ if (request-- == 0) return M_QuitMessage("Are you gonna quit","this game just like","everything else?",NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Milord, methinks that","thou art a lowly","quitter. Is this true?",NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Do I need to bust your","face open for trying","to quit?",NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Man, I oughta smack you","for trying to quit!","Press Y to get","smacked out.",NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Press Y to quit like a","big loser in life.","Press N to stay proud","and successful!",NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("If you press Y to","quit, I will summon","Satan all over your","hard drive!",NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Um, Asmodeus dislikes","his children trying to","quit. Press Y to return","to your Tinkertoys.",NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("If you quit now, I'll","throw a blanket-party","for you next time!",NULL,NULL,NULL,NULL,NULL);
+ break;
+ case GAME_GOODVSBAD2:
+ if (request-- == 0) return M_QuitMessage("Press Yes To Quit","...","Yes",NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Do you really want to","Quit?","Play Good vs bad 3!",NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("All your quit are","belong to long duck","dong",NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Press Y to quit","","But are you too legit?",NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("This game was made by","e@chip-web.com","It is by far the best","game ever made.",NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Even I really dont","know of a game better","Press Y to quit","like rougue chedder",NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("After you stop playing","tell the guys who made","counterstrike to just","kill themselves now",NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Press Y to exit to DOS","","SSH login as user Y","to exit to Linux",NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Press Y like you","were waanderers","from Ys'",NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("This game was made in","Nippon like the SS","announcer's saying ipon",NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("you","want to quit?",NULL,NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Please stop playing","this stupid game",NULL,NULL,NULL,NULL,NULL,NULL);
+ break;
+ case GAME_BATTLEMECH:
+ if (request-- == 0) return M_QuitMessage("? WHY ?","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Leave now and your mech is scrap!","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Accept Defeat?","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Wait! There are more mechs to destroy!","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Where's your bloodlust?","Press Y to quit, N to keep fraggin'",NULL,NULL,NULL,NULL,NULL,NULL);
+ 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;
+ 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);
+ if (request-- == 0) return M_QuitMessage("Are you sure you want to quit?",NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+ if (request-- == 0) return M_QuitMessage("Off to do something constructive?",NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+ break;
+ }
+ return 0;
};
void M_Menu_Quit_f (void)
{
+ int n;
if (m_state == m_quit)
return;
wasInMenus = (key_dest == key_menu);
m_quit_prevstate = m_state;
m_state = m_quit;
m_entersound = true;
- msgNumber = rand()&3; //&7;
+ // count how many there are
+ for (n = 0;M_ChooseQuitMessage(n);n++);
+ // choose one
+ M_ChooseQuitMessage(rand() % n);
}
-void M_Quit_Key (int key)
+void M_Quit_Key (int key, char ascii)
{
switch (key)
{
default:
break;
}
-
}
-
void M_Quit_Draw (void)
{
- M_Background(208, 48);
- M_DrawTextBox(0, 0, 24, 4);
- M_Print(8, 8, quitMessage[msgNumber*4+0]);
- M_Print(8, 16, quitMessage[msgNumber*4+1]);
- M_Print(8, 24, quitMessage[msgNumber*4+2]);
- M_Print(8, 32, quitMessage[msgNumber*4+3]);
+ int i, l, linelength, firstline, lastline, lines;
+ for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_quit_message[i];i++)
+ {
+ if ((l = strlen(m_quit_message[i])))
+ {
+ if (firstline > i)
+ firstline = i;
+ if (lastline < i)
+ lastline = i;
+ if (linelength < l)
+ linelength = l;
+ }
+ }
+ lines = (lastline - firstline) + 1;
+ M_Background(linelength * 8 + 16, lines * 8 + 16);
+ M_DrawTextBox(0, 0, linelength, lines);
+ for (i = 0, l = firstline;i < lines;i++, l++)
+ M_Print(8 + 4 * (linelength - strlen(m_quit_message[l])), 8 + 8 * i, m_quit_message[l]);
}
//=============================================================================
M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [2], 10+((int)(realtime*4)&1));
if (*m_return_reason)
- M_PrintWhite (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;
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;
}
}
}
{"Levels? Bevels!", 0, 8},
};
+level_t battlemechlevels[] =
+{
+ {"start", "Parking Level"},
+ {"dm1", "Hot Dump"}, // 1
+ {"dm2", "The Pits"},
+ {"dm3", "Dimber Died"},
+ {"dm4", "Fire in the Hole"},
+ {"dm5", "Clubhouses"},
+ {"dm6", "Army go Underground"},
+};
+
+episode_t battlemechepisodes[] =
+{
+ {"Time for Battle", 0, 7},
+};
+
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 nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 7};
gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
+gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
typedef struct
{
{GAME_ROGUE, &roguegame, &roguegame},
{GAME_NEHAHRA, &nehahragame, &nehahragame},
{GAME_TRANSFUSION, &transfusiongame, &transfusiongame},
+ {GAME_GOODVSBAD2, &goodvsbad2game, &goodvsbad2game},
+ {GAME_BATTLEMECH, &battlemechgame, &battlemechgame},
{-1, &sharewarequakegame, ®isteredquakegame} // final fallback
};
if (maxplayers == 0)
maxplayers = svs.maxclients;
if (maxplayers < 2)
- maxplayers = MAX_SCOREBOARD;
+ maxplayers = min(8, MAX_SCOREBOARD);
}
else
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");
+ else
+ M_Print (160, 64, "Deathmatch");
+ }
else
{
if (!coop.integer && !deathmatch.integer)
else // changing from BloodBath to CTF
Cvar_SetValueQuick (&deathmatch, 2);
}
+ else if (gamemode == GAME_BATTLEMECH)
+ {
+ if (deathmatch.integer == 2) // changing from Rambo to Deathmatch
+ Cvar_SetValueQuick (&deathmatch, 0);
+ else // changing from Deathmatch to Rambo
+ Cvar_SetValueQuick (&deathmatch, 2);
+ }
else
{
if (deathmatch.integer) // changing from deathmatch to coop
}
}
-void M_GameOptions_Key (int key)
+void M_GameOptions_Key (int key, char ascii)
{
gamelevels_t *g;
int l;
break;
default:
- if (key < 32 || key > 127)
+ if (ascii < 32 || ascii > 126)
break;
if (gameoptions_cursor == 8)
{
if (l < 37)
{
memcpy(hostnamebuf, hostname.string, l);
- hostnamebuf[l] = key;
+ hostnamebuf[l] = ascii;
hostnamebuf[l+1] = 0;
Cvar_Set("hostname", hostnamebuf);
}
{
int n, y, visible, start, end;
cachepic_t *p;
+ const char *s;
// use as much vertical space as available
M_Background(640, vid.conheight);
// scroll the list as the cursor moves
- visible = (vid.conheight - 16 - 32) / 8;
+ s = va("%i/%i masters %i/%i servers", masterreplycount, masterquerycount, serverreplycount, serverquerycount);
+ M_PrintRed((640 - strlen(s) * 8) / 2, 32, s);
+ if (*m_return_reason)
+ M_Print(16, vid.conheight - 8, m_return_reason);
+ y = 48;
+ visible = (vid.conheight - 16 - y) / 8;
start = bound(0, slist_cursor - (visible >> 1), hostCacheCount - visible);
end = min(start + visible, hostCacheCount);
p = Draw_CachePic("gfx/p_multi.lmp");
M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi.lmp");
- y = 32;
- for (n = start;n < end;n++)
+ if (end > start)
{
- M_Print(0, y, hostcache[n].line1);y += 8;
- M_Print(0, y, hostcache[n].line2);y += 8;
+ for (n = start;n < end;n++)
+ {
+ DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
+ M_Print(0, y, hostcache[n].line1);y += 8;
+ M_Print(0, y, hostcache[n].line2);y += 8;
+ }
+ }
+ else if (realtime - masterquerytime < 3)
+ {
+ if (masterquerycount)
+ M_Print(0, y, "No servers found");
+ else
+ M_Print(0, y, "No master servers found (network problem?)");
}
- M_DrawCharacter(0, 32 + (slist_cursor - start) * 16, 12+((int)(realtime*4)&1));
-
- if (*m_return_reason)
- M_PrintWhite(16, vid.conheight - 8, m_return_reason);
}
-void M_ServerList_Key(int k)
+void M_ServerList_Key(int k, char ascii)
{
switch (k)
{
//=============================================================================
/* Menu Subsystem */
+void M_Keydown(int key, char ascii);
+void M_Draw(void);
+void M_ToggleMenu_f(void);
+void M_Shutdown(void);
void M_Init (void)
{
bindnames = quakebindnames;
}
+ // Make sure "keys_cursor" doesn't start on a section in the binding list
+ keys_cursor = 0;
+ while (bindnames[keys_cursor][0][0] == '\0')
+ {
+ keys_cursor++;
+
+ // Only sections? There may be a problem somewhere...
+ if (keys_cursor >= numcommands)
+ Sys_Error ("M_Init: The key binding list only contains sections");
+ }
+
+
if (gamemode == GAME_NEHAHRA)
{
if (FS_FileExists("maps/neh1m4.bsp"))
{
if (key_dest != key_menu)
m_state = m_none;
+
if (m_state == m_none)
return;
}
-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_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)
+{
+}
+
+//============================================================================
+// Menu prog handling
+mfunction_t *PRVM_ED_FindFunction(const char *);
+
+#define M_F_INIT "m_init"
+#define M_F_KEYDOWN "m_keydown"
+#define M_F_DRAW "m_draw"
+#define M_F_TOGGLE "m_toggle"
+#define M_F_SHUTDOWN "m_shutdown"
+
+static char *m_required_func[] = {
+M_F_INIT,
+M_F_KEYDOWN,
+M_F_DRAW,
+M_F_TOGGLE,
+M_F_SHUTDOWN,
+};
+
+static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*);
+
+static func_t m_draw,m_keydown;
+
+void MR_SetRouting (qboolean forceold);
+
+void MP_Error(void)
+{
+ // fall back to the normal menu
+
+ // say it
+ Con_Printf("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, char ascii)
+{
+ PRVM_Begin;
+ PRVM_SetProg(PRVM_MENUPROG);
+
+ // set time
+ *prog->time = realtime;
+
+ // pass key
+ prog->globals[OFS_PARM0] = (float) key;
+ 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;
+}
+
+void MP_ToggleMenu_f (void)
+{
+ PRVM_Begin;
+ PRVM_SetProg(PRVM_MENUPROG);
+
+ // set time
+ *prog->time = realtime;
+
+ PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_TOGGLE) - prog->functions),"");
+
+ PRVM_End;
+}
+
+void MP_Shutdown (void)
+{
+ 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 :
+ PRVM_ResetProg();
+
+ PRVM_End;
+}
+
+void MP_Init (void)
+{
+ PRVM_Begin;
+ PRVM_InitProg(PRVM_MENUPROG);
+
+ prog->crc = M_PROGHEADER_CRC;
+ prog->edictprivate_size = 0; // no private struct used
+ prog->name = M_NAME;
+ prog->limit_edicts = M_MAX_EDICTS;
+ prog->extensionstring = vm_m_extensions;
+ prog->builtins = vm_m_builtins;
+ prog->numbuiltins = vm_m_numbuiltins;
+ prog->init_cmd = VM_M_Cmd_Init;
+ prog->reset_cmd = VM_M_Cmd_Reset;
+ 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);
+
+ PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func);
+
+ // set m_draw and m_keydown
+ m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions);
+ m_keydown = (func_t) (PRVM_ED_FindFunction(M_F_KEYDOWN) - prog->functions);
+
+ // 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();
+}
+
+//============================================================================
+// Menu router
+
+static cvar_t forceqmenu = { 0, "forceqmenu", "0" };
+
+void MR_SetRouting(qboolean forceold)
+{
+ static qboolean m_init = FALSE, mp_init = FALSE;
+
+ // if the menu prog isnt available or forceqmenu ist set, use the old menu
+ if(!FS_FileExists(M_PROG_FILENAME) || forceqmenu.integer || forceold)
+ {
+ // set menu router function pointers
+ MR_Keydown = M_Keydown;
+ MR_Draw = M_Draw;
+ MR_ToggleMenu_f = M_ToggleMenu_f;
+ MR_Shutdown = M_Shutdown;
+
+ // init
+ if(!m_init)
+ {
+ M_Init();
+ m_init = TRUE;
+ }
+ else
+ M_Restart();
+ }
+ else
+ {
+ // set menu router function pointers
+ MR_Keydown = MP_Keydown;
+ MR_Draw = MP_Draw;
+ MR_ToggleMenu_f = MP_ToggleMenu_f;
+ MR_Shutdown = MP_Shutdown;
+
+ if(!mp_init)
+ {
+ MP_Init();
+ mp_init = TRUE;
+ }
+ else
+ MP_Restart();
+ }
+}
+
+void MR_Restart(void)
+{
+ MR_Shutdown ();
+ MR_SetRouting (FALSE);
+}
+
+void MR_Init()
+{
+ // set router console commands
+ Cvar_RegisterVariable (&forceqmenu);
+ Cmd_AddCommand ("menu_restart",MR_Restart);
+
+ // use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1)
+ if(COM_CheckParm("-forceqmenu"))
+ 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"))
+ MR_SetRouting (TRUE);
+ else
+ MR_SetRouting (FALSE);
+}
+
+
+
+
projects / xonotic / darkplaces.git / blobdiff