*/
#include "quakedef.h"
+#include "image.h"
-#ifdef _WIN32
-#include "winquake.h"
-#endif
-
-void (*vid_menudrawfn)(void);
-void (*vid_menukeyfn)(int key);
+#include "mprogdefs.h"
#define TYPE_DEMO 1
#define TYPE_GAME 2
#define TYPE_BOTH 3
+mempool_t *menu_mempool;
+
int NehGameType;
enum m_state_e m_state;
void M_Menu_Save_f (void);
void M_Menu_MultiPlayer_f (void);
void M_Menu_Setup_f (void);
- void M_Menu_Net_f (void);
void M_Menu_Options_f (void);
void M_Menu_Options_Effects_f (void);
+ void M_Menu_Options_ColorControl_f (void);
void M_Menu_Keys_f (void);
void M_Menu_Video_f (void);
void M_Menu_Help_f (void);
void M_Menu_Quit_f (void);
void M_Menu_LanConfig_f (void);
void M_Menu_GameOptions_f (void);
-void M_Menu_Search_f (void);
void M_Menu_ServerList_f (void);
void M_Main_Draw (void);
void M_Save_Draw (void);
void M_MultiPlayer_Draw (void);
void M_Setup_Draw (void);
- void M_Net_Draw (void);
void M_Options_Draw (void);
void M_Options_Effects_Draw (void);
+ void M_Options_ColorControl_Draw (void);
void M_Keys_Draw (void);
void M_Video_Draw (void);
void M_Help_Draw (void);
void M_Quit_Draw (void);
void M_LanConfig_Draw (void);
void M_GameOptions_Draw (void);
-void M_Search_Draw (void);
void M_ServerList_Draw (void);
void M_Main_Key (int key);
void M_Save_Key (int key);
void M_MultiPlayer_Key (int key);
void M_Setup_Key (int key);
- void M_Net_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_Search_Key (int key);
void M_ServerList_Key (int key);
qboolean m_entersound; // play after drawing a frame, so caching
// won't disrupt the sound
-int m_return_state;
-qboolean m_return_onerror;
char m_return_reason [32];
#define StartingGame (m_multiplayer_cursor == 1)
#define JoiningGame (m_multiplayer_cursor == 0)
-#define IPXConfig (m_net_cursor == 0)
-#define TCPIPConfig (m_net_cursor == 1)
-
-void M_ConfigureNetSubsystem(void);
// Nehahra
#define NumberOfNehahraDemos 34
float menu_x, menu_y, menu_width, menu_height;
-void M_DrawBackground(void)
+void M_Background(int width, int height)
{
- menu_width = 320;
- menu_height = 200;
+ menu_width = width;
+ 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_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
}
-void M_Print (float cx, float cy, 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);
}
-void M_PrintWhite (float cx, float cy, 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)
//=============================================================================
-int m_save_demonum;
+//int m_save_demonum;
/*
================
{
m_entersound = true;
- if (key_dest == key_menu)
+ if (key_dest != key_menu || m_state != m_main)
+ M_Menu_Main_f ();
+ else
{
- if (m_state != m_main)
- {
- M_Menu_Main_f ();
- return;
- }
key_dest = key_game;
m_state = m_none;
- return;
- }
- if (key_dest == key_console)
- {
- Con_ToggleConsole_f ();
- }
- else
- {
- M_Menu_Main_f ();
}
}
int demo_cursor;
void M_Demo_Draw (void)
{
- int i;
+ int i;
- for (i=0; i < NumberOfNehahraDemos; i++)
+ M_Background(320, 200);
+
+ for (i = 0;i < NumberOfNehahraDemos;i++)
M_Print (16, 16 + 8*i, NehahraDemos[i].desc);
// line cursor
void M_Menu_Demos_f (void)
{
- key_dest = key_menu;
- m_state = m_demo;
- m_entersound = true;
+ key_dest = key_menu;
+ m_state = m_demo;
+ m_entersound = true;
}
void M_Demo_Key (int 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;
}
else
MAIN_ITEMS = 5;
+ /*
if (key_dest != key_menu)
{
m_save_demonum = cls.demonum;
cls.demonum = -1;
}
+ */
key_dest = key_menu;
m_state = m_main;
m_entersound = true;
int f;
cachepic_t *p;
+ M_Background(320, 200);
+
M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/ttl_main.lmp");
M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main.lmp");
case K_ESCAPE:
key_dest = key_game;
m_state = m_none;
- cls.demonum = m_save_demonum;
- if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
- CL_NextDemo ();
+ //cls.demonum = m_save_demonum;
+ //if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
+ // CL_NextDemo ();
break;
case K_DOWNARROW:
{
cachepic_t *p;
+ M_Background(320, 200);
+
M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/ttl_sgl.lmp");
// Transfusion doesn't have a single player mode
- if (gamemode == GAME_TRANSFUSION)
+ 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);
- M_PrintWhite (95, 10 * 8, "Transfusion is for");
- M_PrintWhite (83, 11 * 8, "multiplayer play only");
+ if (gamemode == GAME_NEXUIZ)
+ M_Print (95, 10 * 8, "Nexuiz is for");
+ else if (gamemode == GAME_GOODVSBAD2)
+ 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_Print (95, 10 * 8, "Transfusion is for");
+ M_Print (83, 11 * 8, "multiplayer play only");
}
else
{
void M_SinglePlayer_Key (int key)
{
- if (gamemode == GAME_TRANSFUSION)
+ if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
{
if (key == K_ESCAPE || key == K_ENTER)
m_state = m_main;
int i, j;
char name[MAX_OSPATH];
char *str;
- QFile *f;
+ qfile_t *f;
int version;
for (i=0 ; i<MAX_SAVEGAMES ; i++)
{
strcpy (m_filenames[i], "--- UNUSED SLOT ---");
loadable[i] = false;
- sprintf (name, "%s/s%i.sav", com_gamedir, i);
- f = Qopen (name, "rz");
+ sprintf (name, "s%i.sav", i);
+ f = FS_Open (name, "r", false);
if (!f)
continue;
- str = Qgetline (f);
+ str = FS_Getline (f);
sscanf (str, "%i\n", &version);
- str = Qgetline (f);
- strncpy (m_filenames[i], str, sizeof(m_filenames[i])-1);
+ str = FS_Getline (f);
+ strlcpy (m_filenames[i], str, sizeof (m_filenames[i]));
// change _ back to space
for (j=0 ; j<SAVEGAME_COMMENT_LENGTH ; j++)
if (m_filenames[i][j] == '_')
m_filenames[i][j] = ' ';
loadable[i] = true;
- Qclose (f);
+ FS_Close (f);
}
}
return;
if (cl.intermission)
return;
- if (svs.maxclients != 1)
+ if (!cl.islocalgame)
return;
m_entersound = true;
m_state = m_save;
int i;
cachepic_t *p;
+ M_Background(320, 200);
+
p = Draw_CachePic ("gfx/p_load.lmp");
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp");
int i;
cachepic_t *p;
+ M_Background(320, 200);
+
p = Draw_CachePic ("gfx/p_save.lmp");
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp");
int f;
cachepic_t *p;
+ M_Background(320, 200);
+
M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/p_multi.lmp");
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
f = (int)(realtime * 10)%6;
M_DrawPic (54, 32 + m_multiplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1));
-
- if (ipxAvailable || tcpipAvailable)
- return;
- M_PrintWhite ((320/2) - ((27*8)/2), 148, "No Communications Available");
}
switch (m_multiplayer_cursor)
{
case 0:
- if (ipxAvailable || tcpipAvailable)
- M_Menu_Net_f ();
- break;
-
case 1:
- if (ipxAvailable || tcpipAvailable)
- M_Menu_Net_f ();
+ M_Menu_LanConfig_f ();
break;
case 2:
//=============================================================================
/* SETUP MENU */
-int setup_cursor = 4;
-int setup_cursor_table[] = {40, 56, 80, 104, 140};
+int setup_cursor = 3;
+int setup_cursor_table[] = {40, 64, 88, 124};
-char setup_hostname[16];
-char setup_myname[16];
+char setup_myname[32];
int setup_oldtop;
int setup_oldbottom;
int setup_top;
int setup_bottom;
-#define NUM_SETUP_CMDS 5
+#define NUM_SETUP_CMDS 4
void M_Menu_Setup_f (void)
{
m_state = m_setup;
m_entersound = true;
strcpy(setup_myname, cl_name.string);
- strcpy(setup_hostname, hostname.string);
setup_top = setup_oldtop = cl_color.integer >> 4;
setup_bottom = setup_oldbottom = cl_color.integer & 15;
}
-// LordHavoc: rewrote this code greatly
-void M_MenuPlayerTranslate (qbyte *translation)
-{
- int i, c;
- unsigned int trans[4096];
- qpic_t *p;
-
- p = W_GetLumpName ("gfx/menuplyr.lmp");
- if (!p)
- return;
- c = p->width * p->height;
- if (c > 4096)
- {
- Con_Printf("M_MenuPlayerTranslate: image larger than 4096 pixel buffer\n");
- return;
- }
-
- for (i = 0;i < c;i++)
- trans[i] = d_8to24table[translation[((qbyte *)p->data)[i]]];
-
- Draw_NewPic("gfx/menuplyr.lmp", p->width, p->height, true, (qbyte *)trans);
-}
+static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load;
+static qbyte *menuplyr_pixels;
+static unsigned int *menuplyr_translated;
void M_Setup_Draw (void)
{
+ int i;
cachepic_t *p;
+ M_Background(320, 200);
+
M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/p_multi.lmp");
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
- M_Print (64, 40, "Hostname");
+ M_Print (64, 40, "Your name");
M_DrawTextBox (160, 32, 16, 1);
- M_Print (168, 40, setup_hostname);
-
- M_Print (64, 56, "Your name");
- M_DrawTextBox (160, 48, 16, 1);
- M_Print (168, 56, setup_myname);
+ M_Print (168, 40, setup_myname);
- M_Print (64, 80, "Shirt color");
- M_Print (64, 104, "Pants color");
-
- M_DrawTextBox (64, 140-8, 14, 1);
- M_Print (72, 140, "Accept Changes");
+ if (gamemode != GAME_GOODVSBAD2)
+ {
+ M_Print (64, 64, "Shirt color");
+ M_Print (64, 88, "Pants color");
+ }
- M_DrawPic (160, 64, "gfx/bigbox.lmp");
+ M_DrawTextBox (64, 124-8, 14, 1);
+ M_Print (72, 124, "Accept Changes");
// LordHavoc: rewrote this code greatly
- M_BuildTranslationTable (setup_top*16, setup_bottom*16);
- M_MenuPlayerTranslate (translationTable);
- M_DrawPic (172, 72, "gfx/menuplyr.lmp");
+ if (menuplyr_load)
+ {
+ qbyte *data, *f;
+ menuplyr_load = false;
+ menuplyr_top = -1;
+ menuplyr_bottom = -1;
+ if ((f = FS_LoadFile("gfx/menuplyr.lmp", true)))
+ {
+ data = LoadLMPAs8Bit (f, 0, 0);
+ menuplyr_width = image_width;
+ menuplyr_height = image_height;
+ Mem_Free(f);
+ menuplyr_pixels = Mem_Alloc(menu_mempool, menuplyr_width * menuplyr_height);
+ menuplyr_translated = Mem_Alloc(menu_mempool, menuplyr_width * menuplyr_height * 4);
+ memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height);
+ Mem_Free(data);
+ }
+ }
- M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1));
+ if (menuplyr_pixels)
+ {
+ if (menuplyr_top != setup_top || menuplyr_bottom != setup_bottom)
+ {
+ menuplyr_top = setup_top;
+ menuplyr_bottom = setup_bottom;
+ M_BuildTranslationTable(menuplyr_top*16, menuplyr_bottom*16);
+ for (i = 0;i < menuplyr_width * menuplyr_height;i++)
+ menuplyr_translated[i] = palette_complete[translationTable[menuplyr_pixels[i]]];
+ Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)menuplyr_translated);
+ }
+ M_DrawPic(160, 48, "gfx/bigbox.lmp");
+ M_DrawPic(172, 56, "gfx/menuplyr.lmp");
+ }
if (setup_cursor == 0)
- M_DrawCharacter (168 + 8*strlen(setup_hostname), setup_cursor_table [setup_cursor], 10+((int)(realtime*4)&1));
-
- if (setup_cursor == 1)
M_DrawCharacter (168 + 8*strlen(setup_myname), setup_cursor_table [setup_cursor], 10+((int)(realtime*4)&1));
+ else
+ M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1));
}
break;
case K_LEFTARROW:
- if (setup_cursor < 2)
+ if (setup_cursor < 1)
return;
S_LocalSound ("misc/menu3.wav");
- if (setup_cursor == 2)
+ if (setup_cursor == 1)
setup_top = setup_top - 1;
- if (setup_cursor == 3)
+ if (setup_cursor == 2)
setup_bottom = setup_bottom - 1;
break;
case K_RIGHTARROW:
- if (setup_cursor < 2)
+ if (setup_cursor < 1)
return;
forward:
S_LocalSound ("misc/menu3.wav");
- if (setup_cursor == 2)
+ if (setup_cursor == 1)
setup_top = setup_top + 1;
- if (setup_cursor == 3)
+ if (setup_cursor == 2)
setup_bottom = setup_bottom + 1;
break;
case K_ENTER:
- if (setup_cursor == 0 || setup_cursor == 1)
+ if (setup_cursor == 0)
return;
- if (setup_cursor == 2 || setup_cursor == 3)
+ if (setup_cursor == 1 || setup_cursor == 2)
goto forward;
- // setup_cursor == 4 (OK)
+ // setup_cursor == 3 (Accept changes)
if (strcmp(cl_name.string, setup_myname) != 0)
Cbuf_AddText ( va ("name \"%s\"\n", setup_myname) );
- if (strcmp(hostname.string, setup_hostname) != 0)
- Cvar_Set("hostname", setup_hostname);
if (setup_top != setup_oldtop || setup_bottom != setup_oldbottom)
Cbuf_AddText( va ("color %i %i\n", setup_top, setup_bottom) );
m_entersound = true;
case K_BACKSPACE:
if (setup_cursor == 0)
- {
- if (strlen(setup_hostname))
- setup_hostname[strlen(setup_hostname)-1] = 0;
- }
-
- if (setup_cursor == 1)
{
if (strlen(setup_myname))
setup_myname[strlen(setup_myname)-1] = 0;
if (k < 32 || k > 127)
break;
if (setup_cursor == 0)
- {
- l = strlen(setup_hostname);
- if (l < 15)
- {
- setup_hostname[l+1] = 0;
- setup_hostname[l] = k;
- }
- }
- if (setup_cursor == 1)
{
l = strlen(setup_myname);
if (l < 15)
}
}
- if (setup_top > 13)
+ if (setup_top > 15)
setup_top = 0;
if (setup_top < 0)
- setup_top = 13;
- if (setup_bottom > 13)
+ setup_top = 15;
+ if (setup_bottom > 15)
setup_bottom = 0;
if (setup_bottom < 0)
- setup_bottom = 13;
-}
-
-//=============================================================================
-/* NET MENU */
-
-int m_net_cursor;
-int m_net_items;
-int m_net_saveHeight;
-
-char *net_helpMessage [] =
-{
-/* .........1.........2.... */
- " Novell network LANs ",
- " or Windows 95 DOS-box. ",
- " ",
- "(LAN=Local Area Network)",
-
- " Commonly used to play ",
- " over the Internet, but ",
- " also used on a Local ",
- " Area Network. "
-};
-
-void M_Menu_Net_f (void)
-{
- key_dest = key_menu;
- m_state = m_net;
- m_entersound = true;
- m_net_items = 2;
-
- if (m_net_cursor >= m_net_items)
- m_net_cursor = 0;
- m_net_cursor--;
- M_Net_Key (K_DOWNARROW);
-}
-
-
-void M_Net_Draw (void)
-{
- int f;
- cachepic_t *p;
-
- M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
-
- f = 32;
-
- if (ipxAvailable)
- M_DrawPic (72, f, "gfx/netmen3.lmp");
- else
- M_DrawPic (72, f, "gfx/dim_ipx.lmp");
-
- f += 19;
- if (tcpipAvailable)
- M_DrawPic (72, f, "gfx/netmen4.lmp");
- else
- M_DrawPic (72, f, "gfx/dim_tcp.lmp");
-
- if (m_net_items == 5) // JDC, could just be removed
- {
- f += 19;
- M_DrawPic (72, f, "gfx/netmen5.lmp");
- }
-
- f = (320-26*8)/2;
- M_DrawTextBox (f, 134, 24, 4);
- f += 8;
- M_Print (f, 142, net_helpMessage[m_net_cursor*4+0]);
- M_Print (f, 150, net_helpMessage[m_net_cursor*4+1]);
-
- f = (int)(realtime * 10)%6;
- M_DrawPic (54, 32 + m_net_cursor * 20, va("gfx/menudot%i.lmp", f+1));
-}
-
-
-void M_Net_Key (int k)
-{
-again:
- switch (k)
- {
- case K_ESCAPE:
- M_Menu_MultiPlayer_f ();
- break;
-
- case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav");
- if (++m_net_cursor >= m_net_items)
- m_net_cursor = 0;
- break;
-
- case K_UPARROW:
- S_LocalSound ("misc/menu1.wav");
- if (--m_net_cursor < 0)
- m_net_cursor = m_net_items - 1;
- break;
-
- case K_ENTER:
- m_entersound = true;
-
- switch (m_net_cursor)
- {
- case 0:
- M_Menu_LanConfig_f ();
- break;
-
- case 1:
- M_Menu_LanConfig_f ();
- break;
-
- case 2:
-// multiprotocol
- break;
- }
- }
-
- if (m_net_cursor == 0 && !ipxAvailable)
- goto again;
- if (m_net_cursor == 1 && !tcpipAvailable)
- goto again;
+ setup_bottom = 15;
}
//=============================================================================
#define SLIDER_RANGE 10
-void M_DrawSlider (int x, int y, float range)
+void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
{
- int i;
-
- if (range < 0)
- range = 0;
- if (range > 1)
- range = 1;
+ char text[16];
+ int i;
+ float range;
+ range = bound(0, (num - rangemin) / (rangemax - rangemin), 1);
M_DrawCharacter (x-8, y, 128);
- for (i=0 ; i<SLIDER_RANGE ; i++)
+ for (i = 0;i < SLIDER_RANGE;i++)
M_DrawCharacter (x + i*8, y, 129);
M_DrawCharacter (x+i*8, y, 130);
M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131);
+ 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);
}
void M_DrawCheckbox (int x, int y, int on)
}
-#define OPTIONS_ITEMS 27
+#define OPTIONS_ITEMS 32
-int options_cursor;
+int options_cursor;
void M_Menu_Options_f (void)
{
m_entersound = true;
}
+extern cvar_t snd_staticvolume;
+extern cvar_t gl_delayfinish;
+extern cvar_t slowmo;
+extern dllhandle_t jpeg_dll;
void M_Menu_Options_AdjustSliders (int dir)
{
+ int optnum;
S_LocalSound ("misc/menu3.wav");
- switch (options_cursor)
- {
- case 5:
- Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
- break;
- case 6:
+ 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 7:
- Cvar_SetValueQuick (&r_skyquality, bound(0, r_skyquality.integer + dir, 2));
- break;
- case 8:
- Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
- 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);
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
- break;
- case 10:
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
- break;
- case 11:
- Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
- break;
- case 12:
- Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.25, 5));
- break;
- case 13:
- Cvar_SetValueQuick (&v_contrast, bound(0.5, v_contrast.value + dir * 0.25, 5));
- break;
- case 14:
- Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8));
- break;
- case 15: // music volume
- #ifdef _WIN32
+ else if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer);
+ 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
+#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:
+ 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 (&crosshair, bound(0, crosshair.integer + dir, 5));
- break;
- case 18:
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
- break;
- case 19: // show framerate
+ else if (options_cursor == optnum++)
+ Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer);
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&showfps, !showfps.integer);
- break;
- case 20: // 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 21: // lookspring
+ }
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&lookspring, !lookspring.integer);
- break;
- case 22: // lookstrafe
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
- break;
- case 23: // mouse speed
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
- break;
- case 24: // mouse look
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&freelook, !freelook.integer);
- break;
- case 25: // invert mouse
+ else if (options_cursor == optnum++)
Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
- break;
- case 26: // 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, 640, 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, 640, 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, 640, 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);
+
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");
- 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_ItemPrint(16, y, " Video Options", vid_menudrawfn != NULL);y += 8;
- M_Print(16, y, " Effects Options");y += 8;
- M_Print(16, y, " 2D Resolution");M_DrawSlider(220, y, scr_2dresolution.value);y += 8;
- M_Print(16, y, " Screen size");M_DrawSlider(220, y, (scr_viewsize.value - 30) /(120 - 30));y += 8;
- M_Print(16, y, " Sky Quality");M_DrawSlider(220, y, r_skyquality.value / 2);y += 8;
- M_Print(16, y, " Overbright Bits");M_DrawSlider(220, y, (v_overbrightbits.value) / 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_ItemPrint(16, y, "Hardware Gamma Control", hardwaregammasupported);M_DrawCheckbox(220, y, v_hwgamma.integer);y += 8;
- M_ItemPrint(16, y, " Gamma", v_hwgamma.integer);M_DrawSlider(220, y, (v_gamma.value - 1) / 4);y += 8;
- M_Print(16, y, " Contrast");M_DrawSlider(220, y, (v_contrast.value - 0.5) / (5 - 0.5));y += 8;
- M_Print(16, y, " Brightness");M_DrawSlider(220, y, v_brightness.value / 0.8);y += 8;
- M_ItemPrint(16, y, " CD Music Volume", cdaudioinitialized);M_DrawSlider(220, y, bgmvolume.value);y += 8;
- M_ItemPrint(16, y, " Sound Volume", snd_initialized);M_DrawSlider(220, y, volume.value);y += 8;
- M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value / 5);y += 8;
- M_Print(16, y, " Crosshair Size");M_DrawSlider(220, y, (crosshair_size.value - 1) / 4);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));
+ // 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;
+ 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( " 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);
}
break;
case 1:
m_state = m_none;
+ key_dest = key_game;
Con_ToggleConsole_f ();
break;
case 2:
Cbuf_AddText ("exec default.cfg\n");
break;
case 3:
- if (vid_menudrawfn)
- M_Menu_Video_f ();
+ M_Menu_Video_f ();
break;
case 4:
M_Menu_Options_Effects_f ();
break;
+ case 5:
+ M_Menu_Options_ColorControl_f ();
+ break;
default:
M_Menu_Options_AdjustSliders (1);
break;
}
}
-#define OPTIONS_EFFECTS_ITEMS 11
+#define OPTIONS_EFFECTS_ITEMS 20
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 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:
+ 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);
- break;
- case 2:
+ 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 3:
+ 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);
- break;
- case 4:
+ 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);
- break;
- case 5:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
- break;
- case 6:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
- break;
- case 7:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
- break;
- case 8:
+ else if (options_effects_cursor == optnum++)
Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
- break;
- case 9:
- Cvar_SetValueQuick (&cl_particles_blood_size, bound(2, cl_particles_blood_size.value + dir * 1, 20));
- break;
- case 10:
+ 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);
+
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");
- y = 32;
- M_Print(16, y, " Lights Per Model");M_DrawSlider(220, y, r_modellights.value / 8);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, " Stainmaps");M_DrawCheckbox(220, y, cl_stainmaps.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) / 18);y += 8;
- M_Print(16, y, " Blood Opacity");M_DrawSlider(220, y, (cl_particles_blood_alpha.value - 0.2) / 0.8);y += 8;
-
- // cursor
- M_DrawCharacter(200, 32 + options_effects_cursor*8, 12+((int)(realtime*4)&1));
+ 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);
}
}
}
-//=============================================================================
-/* KEYS MENU */
-char *bindnames[][2] =
+
+
+
+#define OPTIONS_COLORCONTROL_ITEMS 18
+
+int options_colorcontrol_cursor;
+
+// intensity value to match up to 50% dither to 'correct' quake
+cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25"};
+
+void M_Menu_Options_ColorControl_f (void)
{
-#ifdef TRANSFUSION
-{"+forward", "walk forward"},
-{"+back", "backpedal"},
-{"+moveleft", "step left"},
-{"+moveright", "step right"},
-{"+jump", "jump / swim up"},
-{"+movedown", "swim down"},
-{"+attack", "attack"},
-{"+button3", "altfire"},
-{"impulse 1", "Pitch Fork"},
-{"impulse 2", "Flare Gun"},
-{"impulse 3", "Shotgun"},
-{"impulse 4", "Machine Gun"},
-{"impulse 5", "Incinerator"},
-{"impulse 6", "Bombs"},
-{"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"}
-#else // not TRANSFUSION
-{"+attack", "attack"},
-{"impulse 10", "next weapon"},
-{"impulse 12", "previous weapon"},
-{"+jump", "jump / swim up"},
+ key_dest = key_menu;
+ m_state = m_options_colorcontrol;
+ m_entersound = true;
+}
+
+
+void M_Menu_Options_ColorControl_AdjustSliders (int dir)
+{
+ int optnum;
+ float f;
+ S_LocalSound ("misc/menu3.wav");
+
+ optnum = 1;
+ if (options_colorcontrol_cursor == optnum++)
+ Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
+ 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));
+ }
+ 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));
+ }
+ 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));
+ }
+ else if (options_colorcontrol_cursor == optnum++)
+ {
+ Cvar_SetValueQuick (&v_color_enable, !v_color_enable.integer);
+ }
+ 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));
+ }
+ 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));
+ }
+ 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));
+ }
+ 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);
+ }
+ 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));
+ }
+ 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));
+ }
+ 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));
+ }
+ 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);
+ }
+ 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));
+ }
+ 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));
+ }
+ 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));
+ }
+ 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);
+ }
+}
+
+void M_Options_ColorControl_Draw (void)
+{
+ int visible;
+ float x, c, s, t, u, v;
+ cachepic_t *p;
+
+ M_Background(320, 256);
+
+ 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_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, v_hwgamma.integer);
+ M_Options_PrintSlider( " Gamma", !v_color_enable.integer && vid_hardwaregammasupported && 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 && 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( " 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 + 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;
+ opty += 8;
+ x = 4;
+ 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 + 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 + 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 + 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)
+{
+ switch (k)
+ {
+ case K_ESCAPE:
+ M_Menu_Main_f ();
+ break;
+
+ case K_ENTER:
+ m_entersound = true;
+ switch (options_colorcontrol_cursor)
+ {
+ case 0:
+ Cvar_SetValueQuick(&v_hwgamma, 1);
+ Cvar_SetValueQuick(&v_gamma, 1);
+ Cvar_SetValueQuick(&v_contrast, 1);
+ Cvar_SetValueQuick(&v_brightness, 0);
+ Cvar_SetValueQuick(&v_color_enable, 0);
+ Cvar_SetValueQuick(&v_color_black_r, 0);
+ Cvar_SetValueQuick(&v_color_black_g, 0);
+ Cvar_SetValueQuick(&v_color_black_b, 0);
+ Cvar_SetValueQuick(&v_color_grey_r, 0);
+ Cvar_SetValueQuick(&v_color_grey_g, 0);
+ Cvar_SetValueQuick(&v_color_grey_b, 0);
+ 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);
+ break;
+ }
+ return;
+
+ case K_UPARROW:
+ S_LocalSound ("misc/menu1.wav");
+ options_colorcontrol_cursor--;
+ if (options_colorcontrol_cursor < 0)
+ options_colorcontrol_cursor = OPTIONS_COLORCONTROL_ITEMS-1;
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("misc/menu1.wav");
+ options_colorcontrol_cursor++;
+ if (options_colorcontrol_cursor >= OPTIONS_COLORCONTROL_ITEMS)
+ options_colorcontrol_cursor = 0;
+ break;
+
+ case K_LEFTARROW:
+ M_Menu_Options_ColorControl_AdjustSliders (-1);
+ break;
+
+ case K_RIGHTARROW:
+ M_Menu_Options_ColorControl_AdjustSliders (1);
+ break;
+ }
+}
+
+
+//=============================================================================
+/* KEYS MENU */
+
+char *quakebindnames[][2] =
+{
+{"+attack", "attack"},
+{"impulse 10", "next weapon"},
+{"impulse 12", "previous weapon"},
+{"+jump", "jump / swim up"},
{"+forward", "walk forward"},
{"+back", "backpedal"},
{"+left", "turn left"},
{"+klook", "keyboard look"},
{"+moveup", "swim up"},
{"+movedown", "swim down"}
-#endif // not TRANSFUSION
};
-#define NUMCOMMANDS (sizeof(bindnames)/sizeof(bindnames[0]))
+char *transfusionbindnames[][2] =
+{
+{"", "Movement"}, // Movement commands
+{"+forward", "walk forward"},
+{"+back", "backpedal"},
+{"+left", "turn left"},
+{"+right", "turn right"},
+{"+moveleft", "step left"},
+{"+moveright", "step right"},
+{"+jump", "jump / swim up"},
+{"+movedown", "swim down"},
+{"", "Combat"}, // Combat commands
+{"impulse 1", "Pitch Fork"},
+{"impulse 2", "Flare Gun"},
+{"impulse 3", "Shotgun"},
+{"impulse 4", "Machine Gun"},
+{"impulse 5", "Incinerator"},
+{"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 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] =
+{
+{"impulse 69", "Power 1"},
+{"impulse 70", "Power 2"},
+{"impulse 71", "Power 3"},
+{"+jump", "jump / swim up"},
+{"+forward", "walk forward"},
+{"+back", "backpedal"},
+{"+left", "turn left"},
+{"+right", "turn right"},
+{"+speed", "run"},
+{"+moveleft", "step left"},
+{"+moveright", "step right"},
+{"+strafe", "sidestep"},
+{"+lookup", "look up"},
+{"+lookdown", "look down"},
+{"centerview", "center view"},
+{"+mlook", "mouse look"},
+{"kill", "kill yourself"},
+{"+moveup", "swim up"},
+{"+movedown", "swim down"}
+};
+
+int numcommands;
+char *(*bindnames)[2];
/*
typedef struct binditem_s
cachepic_t *p;
char keystring[1024];
+ M_Background(320, 48 + 8 * numcommands);
+
p = Draw_CachePic ("gfx/ttl_cstm.lmp");
M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp");
M_Print (18, 32, "Enter to change, backspace to clear");
// search for known bindings
- for (i=0 ; i<NUMCOMMANDS ; i++)
+ for (i=0 ; i<numcommands ; i++)
{
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);
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 4
+
+int video_cursor = 0;
+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}};
+int video_resolution;
+
+extern int current_vid_fullscreen;
+extern int current_vid_width;
+extern int current_vid_height;
+extern int current_vid_bitsperpixel;
+
+
void M_Menu_Video_f (void)
{
key_dest = key_menu;
m_state = m_video;
m_entersound = true;
+
+ // Look for the current resolution
+ for (video_resolution = 0; video_resolution < (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0])); 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]))
+ {
+ // may need to update this number if mode list changes
+ video_resolution = 4;
+ Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
+ Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
+ }
}
void M_Video_Draw (void)
{
- (*vid_menudrawfn) ();
+ cachepic_t *p;
+ const char* string;
+
+ M_Background(320, 200);
+
+ M_DrawPic(16, 4, "gfx/qplaque.lmp");
+ p = Draw_CachePic("gfx/vidmodes.lmp");
+ M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes.lmp");
+
+ // 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);
+
+ // 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");
+
+ // Fullscreen
+ M_Print(16, video_cursor_table[2], " Fullscreen");
+ M_DrawCheckbox(220, video_cursor_table[2], vid_fullscreen.integer);
+
+ // "Apply" button
+ M_Print(220, video_cursor_table[3], "Apply");
+
+ // Cursor
+ M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
+}
+
+
+void M_Menu_Video_AdjustSliders (int dir)
+{
+ S_LocalSound ("misc/menu3.wav");
+
+ switch (video_cursor)
+ {
+ // Resolution
+ 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;
+ else
+ video_resolution = new_resolution;
+
+ Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
+ Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
+ break;
+ }
+
+ // Bits per pixel
+ case 1:
+ Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32);
+ break;
+ case 2:
+ Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
+ break;
+ }
}
void M_Video_Key (int key)
{
- (*vid_menukeyfn) (key);
+ switch (key)
+ {
+ case K_ESCAPE:
+ // vid_shared.c has a copy of the current video config. We restore it
+ Cvar_SetValueQuick(&vid_fullscreen, current_vid_fullscreen);
+ Cvar_SetValueQuick(&vid_width, current_vid_width);
+ Cvar_SetValueQuick(&vid_height, current_vid_height);
+ Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel);
+
+ S_LocalSound ("misc/menu1.wav");
+ M_Menu_Options_f ();
+ break;
+
+ case K_ENTER:
+ m_entersound = true;
+ switch (video_cursor)
+ {
+ case 3:
+ Cbuf_AddText ("vid_restart\n");
+ M_Menu_Options_f ();
+ break;
+ default:
+ M_Menu_Video_AdjustSliders (1);
+ }
+ break;
+
+ case K_UPARROW:
+ S_LocalSound ("misc/menu1.wav");
+ video_cursor--;
+ if (video_cursor < 0)
+ video_cursor = VIDEO_ITEMS-1;
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("misc/menu1.wav");
+ video_cursor++;
+ if (video_cursor >= VIDEO_ITEMS)
+ video_cursor = 0;
+ break;
+
+ case K_LEFTARROW:
+ M_Menu_Video_AdjustSliders (-1);
+ break;
+
+ case K_RIGHTARROW:
+ M_Menu_Video_AdjustSliders (1);
+ break;
+ }
}
//=============================================================================
void M_Help_Draw (void)
{
+ M_Background(320, 200);
M_DrawPic (0, 0, va("gfx/help%i.lmp", help_page));
}
//=============================================================================
/* 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;
+}
+
+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);
}
case 'Y':
case 'y':
- key_dest = key_console;
Host_Quit_f ();
break;
default:
break;
}
-
}
-
void M_Quit_Draw (void)
{
- M_DrawTextBox (56, 76, 24, 4);
- M_Print (64, 84, quitMessage[msgNumber*4+0]);
- M_Print (64, 92, quitMessage[msgNumber*4+1]);
- M_Print (64, 100, quitMessage[msgNumber*4+2]);
- M_Print (64, 108, 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]);
}
//=============================================================================
/* LAN CONFIG MENU */
int lanConfig_cursor = -1;
-int lanConfig_cursor_table [] = {72, 92, 124};
+int lanConfig_cursor_table [] = {56, 76, 112};
#define NUM_LANCONFIG_CMDS 3
int lanConfig_port;
m_entersound = true;
if (lanConfig_cursor == -1)
{
- if (JoiningGame && TCPIPConfig)
- lanConfig_cursor = 2;
- else
+ if (JoiningGame)
lanConfig_cursor = 1;
}
- if (StartingGame && lanConfig_cursor == 2)
+ if (StartingGame)
lanConfig_cursor = 1;
- lanConfig_port = DEFAULTnet_hostport;
+ lanConfig_port = 26000;
sprintf(lanConfig_portname, "%u", lanConfig_port);
- m_return_onerror = false;
m_return_reason[0] = 0;
}
char *startJoin;
char *protocol;
+ M_Background(320, 200);
+
M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/p_multi.lmp");
basex = (320-p->width)/2;
startJoin = "New Game";
else
startJoin = "Join Game";
- if (IPXConfig)
- protocol = "IPX";
- else
- protocol = "TCP/IP";
+ protocol = "TCP/IP";
M_Print (basex, 32, va ("%s - %s", startJoin, protocol));
basex += 8;
- M_Print (basex, 52, "Address:");
- if (IPXConfig)
- M_Print (basex+9*8, 52, my_ipx_address);
- else
- M_Print (basex+9*8, 52, my_tcpip_address);
-
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);
if (JoiningGame)
{
- M_Print (basex, lanConfig_cursor_table[1], "Search for local games...");
- M_Print (basex, 108, "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_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [2], 10+((int)(realtime*4)&1));
if (*m_return_reason)
- M_PrintWhite (basex, 148, m_return_reason);
+ M_Print (basex, 168, m_return_reason);
}
switch (key)
{
case K_ESCAPE:
- M_Menu_Net_f ();
+ M_Menu_MultiPlayer_f ();
break;
case K_UPARROW:
m_entersound = true;
- M_ConfigureNetSubsystem ();
+ Cbuf_AddText ("stopdemo\n");
+
+ Cvar_SetValue("port", lanConfig_port);
if (lanConfig_cursor == 1)
{
M_Menu_GameOptions_f ();
break;
}
- M_Menu_Search_f();
+ M_Menu_ServerList_f();
break;
}
if (lanConfig_cursor == 2)
- {
- m_return_state = m_state;
- m_return_onerror = true;
- key_dest = key_game;
- m_state = m_none;
Cbuf_AddText ( va ("connect \"%s\"\n", lanConfig_joinname) );
- break;
- }
-
break;
case K_BACKSPACE:
}
l = atoi(lanConfig_portname);
- if (l > 65535)
- l = lanConfig_port;
- else
+ if (l <= 65535)
lanConfig_port = l;
sprintf(lanConfig_portname, "%u", lanConfig_port);
}
{"Deathmatch Arena", 32, 6}
};
-//MED 01/06/97 added hipnotic levels
+ //MED 01/06/97 added hipnotic levels
level_t hipnoticlevels[] =
{
{"start", "Command HQ"}, // 0
{"bb6", "Twin Fortress"},
{"bb7", "Midgard"},
{"bb8", "Fun With Heads"},
+
{"e1m1", "Cradle to Grave"},
+ {"e1m2", "Wrong Side of the Tracks"},
{"e1m7", "Altar of Stone"},
+ {"e2m8", "The Lair of Shial"},
+ {"e3m7", "The Pit of Cerberus"},
+ {"e4m8", "The Hall of the Epiphany"},
+ {"e4m9", "Mall of the Dead"},
{"dm1", "Monolith Building 11"},
{"dm2", "Power!"},
{"dm3", "Area 15"},
+ {"e6m1", "Welcome to Your Life"},
{"e6m8", "Beauty and the Beast"},
{"cpbb01", "Crypt of Despair"},
- {"cpbb02", "Pits of Blood"},
{"cpbb03", "Unholy Cathedral"},
- {"cpbb04", "Deadly Inspirations"},
{"b2a15", "Area 15 (B2)"},
{"barena", "Blood Arena"},
{"crypt", "The Crypt"},
{"bb3_2k1", "Bodies Infusion"},
+ {"dcamp", "DeathCamp"},
+ {"highnoon", "HighNoon"},
{"qbb1", "The Confluence"},
{"qbb2", "KathartiK"},
{"qbb3", "Caleb's Woodland Retreat"},
- {"ded_simp", "Dead Simple"},
+
{"dranzbb6", "Black Coffee"},
- {"qe1m7", "The House of Chthon"}
+ {"fragm", "Frag'M"},
+ {"maim", "Maim"},
+ {"qe1m7", "The House of Chthon"},
+ {"simple", "Dead Simple"}
};
episode_t transfusionepisodes[] =
{
- {"Blood", 0, 10},
- {"Plasma Pack", 10, 4},
- {"Cryptic Passage", 14, 4},
- {"Blood 2", 18, 5},
- {"Custom", 23, 7}
+ {"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}
+};
+
+level_t goodvsbad2levels[] =
+{
+ {"rts", "Many Paths"}, // 0
+ {"chess", "Chess, Scott Hess"}, // 1
+ {"dot", "Big Wall"},
+ {"city2", "The Big City"},
+ {"bwall", "0 G like Psychic TV"},
+ {"snow", "Wireframed"},
+ {"telep", "Infinite Falling"},
+ {"faces", "Facing Bases"},
+ {"island", "Adventure Islands"},
+};
+
+episode_t goodvsbad2episodes[] =
+{
+ {"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 hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
-gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 5};
+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_HIPNOTIC, &hipnoticgame, &hipnoticgame},
{GAME_ROGUE, &roguegame, &roguegame},
{GAME_NEHAHRA, &nehahragame, &nehahragame},
- {GAME_FIENDARENA, &sharewarequakegame, ®isteredquakegame},
- {GAME_ZYMOTIC, &sharewarequakegame, ®isteredquakegame},
{GAME_TRANSFUSION, &transfusiongame, &transfusiongame},
+ {GAME_GOODVSBAD2, &goodvsbad2game, &goodvsbad2game},
+ {GAME_BATTLEMECH, &battlemechgame, &battlemechgame},
{-1, &sharewarequakegame, ®isteredquakegame} // final fallback
};
qboolean m_serverInfoMessage = false;
double m_serverInfoMessageTime;
+extern cvar_t sv_public;
+
void M_Menu_GameOptions_f (void)
{
key_dest = key_menu;
if (maxplayers == 0)
maxplayers = svs.maxclients;
if (maxplayers < 2)
- maxplayers = svs.maxclientslimit;
+ maxplayers = min(8, MAX_SCOREBOARD);
}
-int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 112, 120};
-#define NUM_GAMEOPTIONS 9
+int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 132, 152, 160};
+#define NUM_GAMEOPTIONS 11
int gameoptions_cursor;
void M_GameOptions_Draw (void)
int x;
gamelevels_t *g;
+ M_Background(320, 200);
+
M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/p_multi.lmp");
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
M_Print (0, 56, " Max players");
M_Print (160, 56, va("%i", maxplayers) );
- 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");
- else
- M_Print (160, 64, "Blood Bath");
- }
- else
+ if (gamemode != GAME_GOODVSBAD2)
{
- if (!coop.integer && !deathmatch.integer)
- Cvar_SetValue("deathmatch", 1);
- if (coop.integer)
- M_Print (160, 64, "Cooperative");
+ 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");
+ 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
- M_Print (160, 64, "Deathmatch");
- }
-
- M_Print (0, 72, " Teamplay");
- if (gamemode == GAME_ROGUE)
- {
- char *msg;
-
- switch((int)teamplay.integer)
{
- case 1: msg = "No Friendly Fire"; break;
- case 2: msg = "Friendly Fire"; break;
- case 3: msg = "Tag"; break;
- case 4: msg = "Capture the Flag"; break;
- case 5: msg = "One Flag CTF"; break;
- case 6: msg = "Three Team CTF"; break;
- default: msg = "Off"; break;
+ if (!coop.integer && !deathmatch.integer)
+ Cvar_SetValue("deathmatch", 1);
+ if (coop.integer)
+ M_Print (160, 64, "Cooperative");
+ else
+ M_Print (160, 64, "Deathmatch");
}
- M_Print (160, 72, msg);
- }
- else if (gamemode == GAME_TRANSFUSION)
- {
- char *msg;
- switch (teamplay.integer)
+ M_Print (0, 72, " Teamplay");
+ if (gamemode == GAME_ROGUE)
{
- case 0: msg = "Off"; break;
- case 2: msg = "Friendly Fire"; break;
- default: msg = "No Friendly Fire"; break;
- }
- M_Print (160, 72, msg);
- }
- else
- {
- char *msg;
+ char *msg;
- switch((int)teamplay.integer)
+ switch((int)teamplay.integer)
+ {
+ case 1: msg = "No Friendly Fire"; break;
+ case 2: msg = "Friendly Fire"; break;
+ case 3: msg = "Tag"; break;
+ case 4: msg = "Capture the Flag"; break;
+ case 5: msg = "One Flag CTF"; break;
+ case 6: msg = "Three Team CTF"; break;
+ default: msg = "Off"; break;
+ }
+ M_Print (160, 72, msg);
+ }
+ else
{
- case 1: msg = "No Friendly Fire"; break;
- case 2: msg = "Friendly Fire"; break;
- default: msg = "Off"; break;
+ char *msg;
+
+ switch (teamplay.integer)
+ {
+ case 0: msg = "Off"; break;
+ 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");
- if (skill.integer == 0)
- M_Print (160, 80, "Easy difficulty");
- else if (skill.integer == 1)
- M_Print (160, 80, "Normal difficulty");
- else if (skill.integer == 2)
- M_Print (160, 80, "Hard difficulty");
- else
- M_Print (160, 80, "Nightmare difficulty");
+ M_Print (0, 80, " Skill");
+ if (skill.integer == 0)
+ M_Print (160, 80, "Easy difficulty");
+ else if (skill.integer == 1)
+ M_Print (160, 80, "Normal difficulty");
+ else if (skill.integer == 2)
+ M_Print (160, 80, "Hard difficulty");
+ else
+ M_Print (160, 80, "Nightmare difficulty");
- M_Print (0, 88, " Frag Limit");
- if (fraglimit.integer == 0)
- M_Print (160, 88, "none");
- else
- M_Print (160, 88, va("%i frags", fraglimit.integer));
+ M_Print (0, 88, " Frag Limit");
+ if (fraglimit.integer == 0)
+ M_Print (160, 88, "none");
+ else
+ M_Print (160, 88, va("%i frags", fraglimit.integer));
- M_Print (0, 96, " Time Limit");
- if (timelimit.integer == 0)
- M_Print (160, 96, "none");
- else
- M_Print (160, 96, va("%i minutes", timelimit.integer));
+ M_Print (0, 96, " Time Limit");
+ if (timelimit.integer == 0)
+ M_Print (160, 96, "none");
+ else
+ 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, 120, " Server name");
+ M_DrawTextBox (0, 124, 38, 1);
+ M_Print (8, 132, hostname.string);
g = lookupgameinfo();
- M_Print (0, 112, " Episode");
- M_Print (160, 112, g->episodes[startepisode].description);
+ if (gamemode != GAME_GOODVSBAD2)
+ {
+ M_Print (0, 152, " Episode");
+ M_Print (160, 152, g->episodes[startepisode].description);
+ }
- M_Print (0, 120, " Level");
- M_Print (160, 120, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
- M_Print (160, 128, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
+ 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);
// line cursor
- M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1));
+ if (gameoptions_cursor == 8)
+ 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));
if (m_serverInfoMessage)
{
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@gamevisions.com ");
+ M_Print (x, 170, " havoc@telefragged.com ");
}
else
- {
m_serverInfoMessage = false;
- }
}
}
{
case 1:
maxplayers += dir;
- if (maxplayers > svs.maxclientslimit)
+ if (maxplayers > MAX_SCOREBOARD)
{
- maxplayers = svs.maxclientslimit;
+ maxplayers = MAX_SCOREBOARD;
m_serverInfoMessage = true;
m_serverInfoMessageTime = realtime;
}
break;
case 2:
+ if (gamemode == GAME_GOODVSBAD2)
+ break;
if (gamemode == GAME_TRANSFUSION)
{
if (deathmatch.integer == 2) // changing from CTF to BloodBath
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
break;
case 3:
+ if (gamemode == GAME_GOODVSBAD2)
+ break;
if (gamemode == GAME_ROGUE)
count = 6;
else
break;
case 4:
+ if (gamemode == GAME_GOODVSBAD2)
+ break;
Cvar_SetValueQuick (&skill, skill.integer + dir);
if (skill.integer > 3)
Cvar_SetValueQuick (&skill, 0);
break;
case 5:
+ if (gamemode == GAME_GOODVSBAD2)
+ break;
Cvar_SetValueQuick (&fraglimit, fraglimit.integer + dir*10);
if (fraglimit.integer > 100)
Cvar_SetValueQuick (&fraglimit, 0);
break;
case 6:
+ if (gamemode == GAME_GOODVSBAD2)
+ break;
Cvar_SetValueQuick (&timelimit, timelimit.value + dir*5);
if (timelimit.value > 60)
Cvar_SetValueQuick (&timelimit, 0);
break;
case 7:
+ Cvar_SetValueQuick (&sv_public, !sv_public.integer);
+ break;
+
+ case 8:
+ break;
+
+ case 9:
+ if (gamemode == GAME_GOODVSBAD2)
+ break;
startepisode += dir;
g = lookupgameinfo();
startlevel = 0;
break;
- case 8:
+ case 10:
startlevel += dir;
g = lookupgameinfo();
void M_GameOptions_Key (int key)
{
gamelevels_t *g;
+ int l;
+ char hostnamebuf[128];
switch (key)
{
case K_ESCAPE:
- M_Menu_Net_f ();
+ M_Menu_MultiPlayer_f ();
break;
case K_UPARROW:
{
if (sv.active)
Cbuf_AddText ("disconnect\n");
- Cbuf_AddText ("listen 0\n"); // so host_netport will be re-examined
Cbuf_AddText ( va ("maxplayers %u\n", maxplayers) );
g = lookupgameinfo();
M_NetStart_Change (1);
break;
- }
-}
-
-//=============================================================================
-/* SEARCH MENU */
-
-qboolean searchComplete = false;
-double searchCompleteTime;
-void M_Menu_Search_f (void)
-{
- key_dest = key_menu;
- m_state = m_search;
- m_entersound = false;
- slistSilent = true;
- slistLocal = false;
- searchComplete = false;
- NET_Slist_f();
-
-}
-
-
-void M_Search_Draw (void)
-{
- cachepic_t *p;
- int x;
-
- p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
- x = (320/2) - ((12*8)/2) + 4;
- M_DrawTextBox (x-8, 32, 12, 1);
- M_Print (x, 40, "Searching...");
-
- if(slistInProgress)
- {
- NET_Poll();
- return;
- }
-
- if (! searchComplete)
- {
- searchComplete = true;
- searchCompleteTime = realtime;
- }
+ case K_BACKSPACE:
+ if (gameoptions_cursor == 8)
+ {
+ l = strlen(hostname.string);
+ if (l)
+ {
+ l = min(l - 1, 37);
+ memcpy(hostnamebuf, hostname.string, l);
+ hostnamebuf[l] = 0;
+ Cvar_Set("hostname", hostnamebuf);
+ }
+ }
+ break;
- if (hostCacheCount)
- {
- M_Menu_ServerList_f ();
- return;
+ default:
+ if (key < 32 || key > 127)
+ break;
+ if (gameoptions_cursor == 8)
+ {
+ l = strlen(hostname.string);
+ if (l < 37)
+ {
+ memcpy(hostnamebuf, hostname.string, l);
+ hostnamebuf[l] = key;
+ hostnamebuf[l+1] = 0;
+ Cvar_Set("hostname", hostnamebuf);
+ }
+ }
}
-
- M_PrintWhite ((320/2) - ((22*8)/2), 64, "No Quake servers found");
- if ((realtime - searchCompleteTime) < 3.0)
- return;
-
- M_Menu_LanConfig_f ();
-}
-
-
-void M_Search_Key (int key)
-{
}
//=============================================================================
/* SLIST MENU */
-int slist_cursor;
-qboolean slist_sorted;
+int slist_cursor;
void M_Menu_ServerList_f (void)
{
m_state = m_slist;
m_entersound = true;
slist_cursor = 0;
- m_return_onerror = false;
m_return_reason[0] = 0;
- slist_sorted = false;
+ Net_Slist_f();
}
void M_ServerList_Draw (void)
{
- int n;
- char string [64];
- cachepic_t *p;
+ int n, y, visible, start, end;
+ cachepic_t *p;
+ const char *s;
- if (!slist_sorted)
+ // use as much vertical space as available
+ M_Background(640, vid.conheight);
+ // scroll the list as the cursor moves
+ 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");
+ if (end > start)
{
- if (hostCacheCount > 1)
+ for (n = start;n < end;n++)
{
- int i,j;
- hostcache_t temp;
- for (i = 0; i < hostCacheCount; i++)
- for (j = i+1; j < hostCacheCount; j++)
- if (strcmp(hostcache[j].name, hostcache[i].name) < 0)
- {
- memcpy(&temp, &hostcache[j], sizeof(hostcache_t));
- memcpy(&hostcache[j], &hostcache[i], sizeof(hostcache_t));
- memcpy(&hostcache[i], &temp, sizeof(hostcache_t));
- }
+ 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;
}
- slist_sorted = true;
}
-
- p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
- for (n = 0; n < hostCacheCount; n++)
+ else if (realtime - masterquerytime < 3)
{
- if (hostcache[n].maxusers)
- sprintf(string, "%-15.15s %-15.15s %2u/%2u\n", hostcache[n].name, hostcache[n].map, hostcache[n].users, hostcache[n].maxusers);
+ if (masterquerycount)
+ M_Print(0, y, "No servers found");
else
- sprintf(string, "%-15.15s %-15.15s\n", hostcache[n].name, hostcache[n].map);
- M_Print (16, 32 + 8*n, string);
+ M_Print(0, y, "No master servers found (network problem?)");
}
- M_DrawCharacter (0, 32 + slist_cursor*8, 12+((int)(realtime*4)&1));
-
- if (*m_return_reason)
- M_PrintWhite (16, 148, m_return_reason);
}
-void M_ServerList_Key (int k)
+void M_ServerList_Key(int k)
{
switch (k)
{
case K_ESCAPE:
- M_Menu_LanConfig_f ();
+ M_Menu_LanConfig_f();
break;
case K_SPACE:
- M_Menu_Search_f ();
+ Net_Slist_f();
break;
case K_UPARROW:
case K_LEFTARROW:
- S_LocalSound ("misc/menu1.wav");
+ S_LocalSound("misc/menu1.wav");
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");
slist_cursor++;
if (slist_cursor >= hostCacheCount)
slist_cursor = 0;
break;
case K_ENTER:
- S_LocalSound ("misc/menu2.wav");
- m_return_state = m_state;
- m_return_onerror = true;
- slist_sorted = false;
- key_dest = key_game;
- m_state = m_none;
- Cbuf_AddText ( va ("connect \"%s\"\n", hostcache[slist_cursor].cname) );
+ S_LocalSound("misc/menu2.wav");
+ Cbuf_AddText(va("connect \"%s\"\n", hostcache[slist_cursor].cname));
break;
default:
//=============================================================================
/* Menu Subsystem */
+void M_Keydown(int key);
+void M_Draw(void);
+void M_ToggleMenu_f(void);
+void M_Shutdown(void);
void M_Init (void)
{
+ menu_mempool = Mem_AllocPool("Menu");
+ menuplyr_load = true;
+ menuplyr_pixels = NULL;
+
Cmd_AddCommand ("togglemenu", M_ToggleMenu_f);
Cmd_AddCommand ("menu_main", M_Menu_Main_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_colorcontrol", M_Menu_Options_ColorControl_f);
+ Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
Cmd_AddCommand ("menu_keys", M_Menu_Keys_f);
Cmd_AddCommand ("menu_video", M_Menu_Video_f);
Cmd_AddCommand ("help", M_Menu_Help_f);
Cmd_AddCommand ("menu_quit", M_Menu_Quit_f);
+ if (gamemode == GAME_TRANSFUSION)
+ {
+ numcommands = sizeof(transfusionbindnames) / sizeof(transfusionbindnames[0]);
+ bindnames = transfusionbindnames;
+ }
+ else if (gamemode == GAME_GOODVSBAD2)
+ {
+ numcommands = sizeof(goodvsbad2bindnames) / sizeof(goodvsbad2bindnames[0]);
+ bindnames = goodvsbad2bindnames;
+ }
+ else
+ {
+ numcommands = sizeof(quakebindnames) / sizeof(quakebindnames[0]);
+ 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 (COM_FileExists("maps/neh1m4.bsp"))
+ if (FS_FileExists("maps/neh1m4.bsp"))
{
- if (COM_FileExists("hearing.dem"))
+ if (FS_FileExists("hearing.dem"))
{
Con_Printf("Nehahra movie and game detected.\n");
NehGameType = TYPE_BOTH;
}
else
{
- if (COM_FileExists("hearing.dem"))
+ if (FS_FileExists("hearing.dem"))
{
Con_Printf("Nehahra movie detected.\n");
NehGameType = TYPE_DEMO;
void M_Draw (void)
{
- if (m_state == m_none || key_dest != key_menu)
- return;
+ if (key_dest != key_menu)
+ m_state = m_none;
- M_DrawBackground();
+ if (m_state == m_none)
+ return;
switch (m_state)
{
M_Setup_Draw ();
break;
- case m_net:
- M_Net_Draw ();
- break;
-
case m_options:
M_Options_Draw ();
break;
M_Options_Effects_Draw ();
break;
+ case m_options_colorcontrol:
+ M_Options_ColorControl_Draw ();
+ break;
+
case m_keys:
M_Keys_Draw ();
break;
M_GameOptions_Draw ();
break;
- case m_search:
- M_Search_Draw ();
- break;
-
case m_slist:
M_ServerList_Draw ();
break;
M_Setup_Key (key);
return;
- case m_net:
- M_Net_Key (key);
- return;
-
case m_options:
M_Options_Key (key);
return;
M_Options_Effects_Key (key);
return;
+ case m_options_colorcontrol:
+ M_Options_ColorControl_Key (key);
+ return;
+
case m_keys:
M_Keys_Key (key);
return;
M_GameOptions_Key (key);
return;
- case m_search:
- M_Search_Key (key);
- break;
-
case m_slist:
M_ServerList_Key (key);
return;
}
}
+void M_Shutdown(void)
+{
+}
+
+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 Error :");
+
+ // init the normal menu now -> this will also correct the menu router pointers
+ MR_SetRouting (TRUE);
+}
+
+void MP_Keydown (int key)
+{
+ PRVM_Begin;
+ PRVM_SetProg(PRVM_MENUPROG);
+
+ // pass key
+ prog->globals[OFS_PARM0] = (float) key;
+ PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key) required\n");
+
+ PRVM_End;
+}
+void MP_Draw (void)
+{
+ PRVM_Begin;
+ PRVM_SetProg(PRVM_MENUPROG);
+
+ PRVM_ExecuteProgram(m_draw,"");
+
+ PRVM_End;
+}
+
+void MP_ToggleMenu_f (void)
+{
+ PRVM_Begin;
+ PRVM_SetProg(PRVM_MENUPROG);
+
+ PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_TOGGLE) - prog->functions),"");
+
+ PRVM_End;
+}
-void M_ConfigureNetSubsystem(void)
+void MP_Shutdown (void)
{
-// enable/disable net systems to match desired config
+ PRVM_Begin;
+ PRVM_SetProg(PRVM_MENUPROG);
+
+ 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;
+}
+
+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);
- Cbuf_AddText ("stopdemo\n");
+ // 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);
- if (IPXConfig || TCPIPConfig)
- net_hostport = lanConfig_port;
+ // 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);
+
+ MR_SetRouting (FALSE);
+}
+
+
+
+
projects / xonotic / darkplaces.git / blobdiff