X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=c729750b73667b9d4715a4f449f1d8d542d206ff;hp=e768754171cd7f2d9703d6a0dc1d2a51b4d99939;hb=5385844e6dd47a347e48032f0e5b191358d82266;hpb=81d139b0b4089418db4f11c50cfb4abd83816d1e diff --git a/menu.c b/menu.c index e7687541..c729750b 100644 --- a/menu.c +++ b/menu.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -19,10 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" -#ifdef _WIN32 -#include "winquake.h" -#endif - void (*vid_menudrawfn)(void); void (*vid_menukeyfn)(int key); @@ -42,6 +38,7 @@ void M_Menu_Main_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_Keys_f (void); void M_Menu_Video_f (void); void M_Menu_Help_f (void); @@ -49,6 +46,7 @@ void M_Menu_Main_f (void); void M_Menu_LanConfig_f (void); void M_Menu_GameOptions_f (void); void M_Menu_Search_f (void); +void M_Menu_InetSearch_f (void); void M_Menu_ServerList_f (void); void M_Main_Draw (void); @@ -59,6 +57,7 @@ void M_Main_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_Keys_Draw (void); void M_Video_Draw (void); void M_Help_Draw (void); @@ -66,6 +65,7 @@ void M_Main_Draw (void); void M_LanConfig_Draw (void); void M_GameOptions_Draw (void); void M_Search_Draw (void); +void M_InetSearch_Draw (void); void M_ServerList_Draw (void); void M_Main_Key (int key); @@ -76,6 +76,7 @@ void M_Main_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_Keys_Key (int key); void M_Video_Key (int key); void M_Help_Key (int key); @@ -83,11 +84,11 @@ void M_Main_Key (int key); void M_LanConfig_Key (int key); void M_GameOptions_Key (int key); void M_Search_Key (int key); +void M_InetSearch_Key (int key); void M_ServerList_Key (int key); qboolean m_entersound; // play after drawing a frame, so caching // won't disrupt the sound -//qboolean m_recursiveDraw; int m_return_state; qboolean m_return_onerror; @@ -101,14 +102,61 @@ char m_return_reason [32]; void M_ConfigureNetSubsystem(void); // Nehahra -int NumberOfDemos; +#define NumberOfNehahraDemos 34 typedef struct { - char name[50]; - char desc[50]; -} demonames_t; + char *name; + char *desc; +} nehahrademonames_t; + +nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] = +{ + {"intro", "Prologue"}, + {"genf", "The Beginning"}, + {"genlab", "A Doomed Project"}, + {"nehcre", "The New Recruits"}, + {"maxneh", "Breakthrough"}, + {"maxchar", "Renewal and Duty"}, + {"crisis", "Worlds Collide"}, + {"postcris", "Darkening Skies"}, + {"hearing", "The Hearing"}, + {"getjack", "On a Mexican Radio"}, + {"prelude", "Honor and Justice"}, + {"abase", "A Message Sent"}, + {"effect", "The Other Side"}, + {"uhoh", "Missing in Action"}, + {"prepare", "The Response"}, + {"vision", "Farsighted Eyes"}, + {"maxturns", "Enter the Immortal"}, + {"backlot", "Separate Ways"}, + {"maxside", "The Ancient Runes"}, + {"counter", "The New Initiative"}, + {"warprep", "Ghosts to the World"}, + {"counter1", "A Fate Worse Than Death"}, + {"counter2", "Friendly Fire"}, + {"counter3", "Minor Setback"}, + {"madmax", "Scores to Settle"}, + {"quake", "One Man"}, + {"cthmm", "Shattered Masks"}, + {"shades", "Deal with the Dead"}, + {"gophil", "An Unlikely Hero"}, + {"cstrike", "War in Hell"}, + {"shubset", "The Conspiracy"}, + {"shubdie", "Even Death May Die"}, + {"newranks", "An Empty Throne"}, + {"seal", "The Seal is Broken"} +}; -demonames_t Demos[35]; +float menu_x, menu_y, menu_width, menu_height; + +void M_DrawBackground(void) +{ + menu_width = 320; + menu_height = 200; + menu_x = (vid.conwidth - menu_width) * 0.5; + menu_y = (vid.conheight - menu_height) * 0.5; + DrawQ_Fill(0, 0, vid.conwidth, vid.conheight, 0, 0, 0, 0.5, 0); +} /* ================ @@ -117,43 +165,44 @@ M_DrawCharacter Draws one solid graphics character ================ */ -void M_DrawCharacter (int cx, int line, int num) +void M_DrawCharacter (float cx, float cy, int num) { - Draw_Character ( cx + ((vid.width - 320)>>1), line, num); + char temp[2]; + temp[0] = num; + temp[1] = 0; + DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0); } -void M_Print (int cx, int cy, char *str) +void M_Print (float cx, float cy, char *str) { - while (*str) - { - M_DrawCharacter (cx, cy, (*str)+128); - str++; - cx += 8; - } + DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0); } -void M_PrintWhite (int cx, int cy, char *str) +void M_PrintWhite (float cx, float cy, char *str) { - while (*str) - { - M_DrawCharacter (cx, cy, *str); - str++; - cx += 8; - } + DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0); } -void M_DrawPic (int x, int y, qpic_t *pic) +void M_ItemPrint (float cx, float cy, char *str, int unghosted) { - Draw_Pic (x + ((vid.width - 320)>>1), y, pic); + if (unghosted) + DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0); + else + DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0); } -byte identityTable[256]; -byte translationTable[256]; +void M_DrawPic (float cx, float cy, char *picname) +{ + DrawQ_Pic (menu_x + cx, menu_y + cy, picname, 0, 0, 1, 1, 1, 1, 0); +} + +qbyte identityTable[256]; +qbyte translationTable[256]; void M_BuildTranslationTable(int top, int bottom) { - int j; - byte *dest, *source; + int j; + qbyte *dest, *source; for (j = 0; j < 256; j++) identityTable[j] = j; @@ -177,70 +226,55 @@ void M_BuildTranslationTable(int top, int bottom) } -void M_DrawPicTranslate (int x, int y, qpic_t *pic) -{ - Draw_PicTranslate (x + ((vid.width - 320)>>1), y, pic, translationTable); -} - - -void M_DrawTextBox (int x, int y, int width, int lines) +void M_DrawTextBox (float x, float y, float width, float height) { - qpic_t *p; - int cx, cy; - int n; + int n; + float cx, cy; // draw left side cx = x; cy = y; - p = Draw_CachePic ("gfx/box_tl.lmp"); - M_DrawPic (cx, cy, p); - p = Draw_CachePic ("gfx/box_ml.lmp"); - for (n = 0; n < lines; n++) + M_DrawPic (cx, cy, "gfx/box_tl.lmp"); + for (n = 0; n < height; n++) { cy += 8; - M_DrawPic (cx, cy, p); + M_DrawPic (cx, cy, "gfx/box_ml.lmp"); } - p = Draw_CachePic ("gfx/box_bl.lmp"); - M_DrawPic (cx, cy+8, p); + M_DrawPic (cx, cy+8, "gfx/box_bl.lmp"); // draw middle cx += 8; while (width > 0) { cy = y; - p = Draw_CachePic ("gfx/box_tm.lmp"); - M_DrawPic (cx, cy, p); - p = Draw_CachePic ("gfx/box_mm.lmp"); - for (n = 0; n < lines; n++) + M_DrawPic (cx, cy, "gfx/box_tm.lmp"); + for (n = 0; n < height; n++) { cy += 8; - if (n == 1) - p = Draw_CachePic ("gfx/box_mm2.lmp"); - M_DrawPic (cx, cy, p); + if (n >= 1) + M_DrawPic (cx, cy, "gfx/box_mm2.lmp"); + else + M_DrawPic (cx, cy, "gfx/box_mm.lmp"); } - p = Draw_CachePic ("gfx/box_bm.lmp"); - M_DrawPic (cx, cy+8, p); + M_DrawPic (cx, cy+8, "gfx/box_bm.lmp"); width -= 2; cx += 16; } // draw right side cy = y; - p = Draw_CachePic ("gfx/box_tr.lmp"); - M_DrawPic (cx, cy, p); - p = Draw_CachePic ("gfx/box_mr.lmp"); - for (n = 0; n < lines; n++) + M_DrawPic (cx, cy, "gfx/box_tr.lmp"); + for (n = 0; n < height; n++) { cy += 8; - M_DrawPic (cx, cy, p); + M_DrawPic (cx, cy, "gfx/box_mr.lmp"); } - p = Draw_CachePic ("gfx/box_br.lmp"); - M_DrawPic (cx, cy+8, p); + M_DrawPic (cx, cy+8, "gfx/box_br.lmp"); } //============================================================================= -int m_save_demonum; +//int m_save_demonum; /* ================ @@ -262,69 +296,20 @@ void M_ToggleMenu_f (void) m_state = m_none; return; } - if (key_dest == key_console) - { - Con_ToggleConsole_f (); - } - else - { + //if (key_dest == key_console) + // Con_ToggleConsole_f (); + //else M_Menu_Main_f (); - } -} - -// LordHavoc: FIXME: finish this menu stuff -#if 0 -#define MAXMENUITEMS 128 - -typedef struct menuitem_s -{ - char *string; // may be text, or an image to use, or a cvar name, depending on the functions used - char *description; - char *command; // used by command items mainly (when used, this command is executed) - cvar_t *cvar; // used for cvar items (sliders, number boxes), value is retrieved from the cvar itself - int selectable; // purely decorative if this is false - int selected; // true if this menu item is currently selected, used by funcs so they don't need to know anything but fields in the menuitem - float selecttime; // the time that this menu item was activated (copied from realtime), used for animating selection flashs and such - float color[4]; // current color for the item (may be different than base color, due to selection flash effects) - float basecolor[4]; // the base color - float x, y, width, height; // width and height are used for mouse selection - void(*drawfunc)(struct menuitem_s *item); - void(*activefunc)(struct menuitem_s *item); -// void(*selectfunc)(struct menuitem_s *item); -// void(*deselectfunc)(struct menuitem_s *item); - void(*usefunc)(struct menuitem_s *item); -} -menuitem_t; - -menuitem_t menuitem[MAXMENUITEMS]; -int menuitems; - -void menuitem_text_drawfunc(struct menuitem_s *item) -{ - // FIXME: handle color flashs and such when selected - M_Print (item->x, item->y, item->string); -} - -void menuitem_image_drawfunc(struct menuitem_s *item) -{ - qpic_t *p = Draw_CachePic (item->string); - // FIXME: handle color flashs and such when selected - M_DrawPic (item->x, item->y, p); } -void menuitem_command_usefunc(struct menuitem_s *item) -{ - Cbuf_AddText (item->command); -} -#endif int demo_cursor; void M_Demo_Draw (void) { int i; - for (i=0; i < NumberOfDemos; i++) - M_Print (16, 16 + 8*i, Demos[i].desc); + for (i=0; i < NumberOfNehahraDemos; i++) + M_Print (16, 16 + 8*i, NehahraDemos[i].desc); // line cursor M_DrawCharacter (8, 16 + demo_cursor*8, 12+((int)(realtime*4)&1)); @@ -333,47 +318,9 @@ void M_Demo_Draw (void) void M_Menu_Demos_f (void) { - key_dest = key_menu; - m_state = m_demo; - m_entersound = true; - - - NumberOfDemos = 34; - - strcpy(Demos[0].name, "intro"); strcpy(Demos[0].desc, "Prologue"); - strcpy(Demos[1].name, "genf"); strcpy(Demos[1].desc, "The Beginning"); - strcpy(Demos[2].name, "genlab"); strcpy(Demos[2].desc, "A Doomed Project"); - strcpy(Demos[3].name, "nehcre"); strcpy(Demos[3].desc, "The New Recruits"); - strcpy(Demos[4].name, "maxneh"); strcpy(Demos[4].desc, "Breakthrough"); - strcpy(Demos[5].name, "maxchar"); strcpy(Demos[5].desc, "Renewal and Duty"); - strcpy(Demos[6].name, "crisis"); strcpy(Demos[6].desc, "Worlds Collide"); - strcpy(Demos[7].name, "postcris"); strcpy(Demos[7].desc, "Darkening Skies"); - strcpy(Demos[8].name, "hearing"); strcpy(Demos[8].desc, "The Hearing"); - strcpy(Demos[9].name, "getjack"); strcpy(Demos[9].desc, "On a Mexican Radio"); - strcpy(Demos[10].name, "prelude"); strcpy(Demos[10].desc, "Honor and Justice"); - strcpy(Demos[11].name, "abase"); strcpy(Demos[11].desc, "A Message Sent"); - strcpy(Demos[12].name, "effect"); strcpy(Demos[12].desc, "The Other Side"); - strcpy(Demos[13].name, "uhoh"); strcpy(Demos[13].desc, "Missing in Action"); - strcpy(Demos[14].name, "prepare"); strcpy(Demos[14].desc, "The Response"); - strcpy(Demos[15].name, "vision"); strcpy(Demos[15].desc, "Farsighted Eyes"); - strcpy(Demos[16].name, "maxturns"); strcpy(Demos[16].desc, "Enter the Immortal"); - strcpy(Demos[17].name, "backlot"); strcpy(Demos[17].desc, "Separate Ways"); - strcpy(Demos[18].name, "maxside"); strcpy(Demos[18].desc, "The Ancient Runes"); - strcpy(Demos[19].name, "counter"); strcpy(Demos[19].desc, "The New Initiative"); - strcpy(Demos[20].name, "warprep"); strcpy(Demos[20].desc, "Ghosts to the World"); - strcpy(Demos[21].name, "counter1"); strcpy(Demos[21].desc, "A Fate Worse Than Death"); - strcpy(Demos[22].name, "counter2"); strcpy(Demos[22].desc, "Friendly Fire"); - strcpy(Demos[23].name, "counter3"); strcpy(Demos[23].desc, "Minor Setback"); - strcpy(Demos[24].name, "madmax"); strcpy(Demos[24].desc, "Scores to Settle"); - strcpy(Demos[25].name, "quake"); strcpy(Demos[25].desc, "One Man"); - strcpy(Demos[26].name, "cthmm"); strcpy(Demos[26].desc, "Shattered Masks"); - strcpy(Demos[27].name, "shades"); strcpy(Demos[27].desc, "Deal with the Dead"); - strcpy(Demos[28].name, "gophil"); strcpy(Demos[28].desc, "An Unlikely Hero"); - strcpy(Demos[29].name, "cstrike"); strcpy(Demos[29].desc, "War in Hell"); - strcpy(Demos[30].name, "shubset"); strcpy(Demos[30].desc, "The Conspiracy"); - strcpy(Demos[31].name, "shubdie"); strcpy(Demos[31].desc, "Even Death May Die"); - strcpy(Demos[32].name, "newranks"); strcpy(Demos[32].desc, "An Empty Throne"); - strcpy(Demos[33].name, "seal"); strcpy(Demos[33].desc, "The Seal is Broken"); + key_dest = key_menu; + m_state = m_demo; + m_entersound = true; } void M_Demo_Key (int k) @@ -388,8 +335,7 @@ void M_Demo_Key (int k) S_LocalSound ("misc/menu2.wav"); m_state = m_none; key_dest = key_game; -// SCR_BeginLoadingPlaque (); - Cbuf_AddText (va ("playdemo %s\n", Demos[demo_cursor].name)); + Cbuf_AddText (va ("playdemo %s\n", NehahraDemos[demo_cursor].name)); return; case K_UPARROW: @@ -397,14 +343,14 @@ void M_Demo_Key (int k) S_LocalSound ("misc/menu1.wav"); demo_cursor--; if (demo_cursor < 0) - demo_cursor = NumberOfDemos; + demo_cursor = NumberOfNehahraDemos; break; case K_DOWNARROW: case K_RIGHTARROW: S_LocalSound ("misc/menu1.wav"); demo_cursor++; - if (demo_cursor > NumberOfDemos) + if (demo_cursor > NumberOfNehahraDemos) demo_cursor = 0; break; } @@ -414,13 +360,12 @@ void M_Demo_Key (int k) /* MAIN MENU */ int m_main_cursor; -//#define MAIN_ITEMS 5 int MAIN_ITEMS = 4; // Nehahra: Menu Disable void M_Menu_Main_f (void) { - if (nehahra) + if (gamemode == GAME_NEHAHRA) { if (NehGameType == TYPE_DEMO) MAIN_ITEMS = 4; @@ -432,11 +377,13 @@ void M_Menu_Main_f (void) 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; @@ -446,27 +393,27 @@ void M_Menu_Main_f (void) void M_Main_Draw (void) { int f; - qpic_t *p; + cachepic_t *p; - M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/ttl_main.lmp"); - M_DrawPic ( (320-p->width)/2, 4, p); + M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main.lmp"); // Nehahra - if (nehahra) + if (gamemode == GAME_NEHAHRA) { if (NehGameType == TYPE_BOTH) - M_DrawPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp")); + M_DrawPic (72, 32, "gfx/mainmenu.lmp"); else if (NehGameType == TYPE_GAME) - M_DrawPic (72, 32, Draw_CachePic ("gfx/gamemenu.lmp")); + M_DrawPic (72, 32, "gfx/gamemenu.lmp"); else - M_DrawPic (72, 32, Draw_CachePic ("gfx/demomenu.lmp")); + M_DrawPic (72, 32, "gfx/demomenu.lmp"); } else - M_DrawPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp")); + M_DrawPic (72, 32, "gfx/mainmenu.lmp"); f = (int)(realtime * 10)%6; - M_DrawPic (54, 32 + m_main_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); + M_DrawPic (54, 32 + m_main_cursor * 20, va("gfx/menudot%i.lmp", f+1)); } @@ -477,9 +424,9 @@ void M_Main_Key (int key) 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: @@ -497,7 +444,7 @@ void M_Main_Key (int key) case K_ENTER: m_entersound = true; - if (nehahra) + if (gamemode == GAME_NEHAHRA) { switch (NehGameType) { @@ -629,22 +576,43 @@ void M_Menu_SinglePlayer_f (void) void M_SinglePlayer_Draw (void) { - int f; - qpic_t *p; + cachepic_t *p; - M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/ttl_sgl.lmp"); - M_DrawPic ( (320-p->width)/2, 4, p); - M_DrawPic (72, 32, Draw_CachePic ("gfx/sp_menu.lmp") ); - f = (int)(realtime * 10)%6; + // Transfusion doesn't have a single player mode + if (gamemode == GAME_TRANSFUSION) + { + 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"); + } + else + { + int f; + + M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl.lmp"); + M_DrawPic (72, 32, "gfx/sp_menu.lmp"); + + f = (int)(realtime * 10)%6; - M_DrawPic (54, 32 + m_singleplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); + M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1)); + } } void M_SinglePlayer_Key (int key) { + if (gamemode == GAME_TRANSFUSION) + { + if (key == K_ESCAPE || key == K_ENTER) + m_state = m_main; + return; + } + switch (key) { case K_ESCAPE: @@ -673,7 +641,9 @@ void M_SinglePlayer_Key (int key) if (sv.active) Cbuf_AddText ("disconnect\n"); Cbuf_AddText ("maxplayers 1\n"); - if (nehahra) + Cbuf_AddText ("deathmatch 0\n"); + Cbuf_AddText ("coop 0\n"); + if (gamemode == GAME_NEHAHRA) Cbuf_AddText ("map nehstart\n"); else Cbuf_AddText ("map start\n"); @@ -756,10 +726,10 @@ void M_Menu_Save_f (void) void M_Load_Draw (void) { int i; - qpic_t *p; + cachepic_t *p; p = Draw_CachePic ("gfx/p_load.lmp"); - M_DrawPic ( (320-p->width)/2, 4, p); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp"); for (i=0 ; i< MAX_SAVEGAMES; i++) M_Print (16, 32 + 8*i, m_filenames[i]); @@ -772,10 +742,10 @@ void M_Load_Draw (void) void M_Save_Draw (void) { int i; - qpic_t *p; + cachepic_t *p; p = Draw_CachePic ("gfx/p_save.lmp"); - M_DrawPic ( (320-p->width)/2, 4, p); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp"); for (i=0 ; iwidth)/2, 4, p); - M_DrawPic (72, 32, Draw_CachePic ("gfx/mp_menu.lmp") ); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); + M_DrawPic (72, 32, "gfx/mp_menu.lmp"); f = (int)(realtime * 10)%6; - M_DrawPic (54, 32 + m_multiplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); + 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"); + M_PrintWhite ((320/2) - ((27*8)/2), 168, "No Communications Available"); } @@ -958,18 +923,66 @@ void M_Menu_Setup_f (void) m_entersound = true; strcpy(setup_myname, cl_name.string); strcpy(setup_hostname, hostname.string); - setup_top = setup_oldtop = ((int)cl_color.value) >> 4; - setup_bottom = setup_oldbottom = ((int)cl_color.value) & 15; + 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 top, int bottom) +{ + int i; + unsigned int trans[4096]; + qbyte *data, *f; + static qbyte pixels[4096]; + static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load = true, menuplyr_failed = false; + + if (menuplyr_failed) + return; + if (menuplyr_top == top && menuplyr_bottom == bottom) + return; + + menuplyr_top = top; + menuplyr_bottom = bottom; + + if (menuplyr_load) + { + menuplyr_load = false; + f = COM_LoadFile("gfx/menuplyr.lmp", true); + if (!f) + { + menuplyr_failed = true; + return; + } + data = LoadLMPAs8Bit (f, 0, 0); + Mem_Free(f); + if (image_width * image_height > 4096) + { + Con_Printf("M_MenuPlayerTranslate: image larger than 4096 pixel buffer\n"); + Mem_Free(data); + menuplyr_failed = true; + return; + } + menuplyr_width = image_width; + menuplyr_height = image_height; + memcpy(pixels, data, menuplyr_width * menuplyr_height); + Mem_Free(data); + } + + M_BuildTranslationTable (menuplyr_top*16, menuplyr_bottom*16); + + for (i = 0;i < menuplyr_width * menuplyr_height;i++) + trans[i] = d_8to24table[translation[pixels[i]]]; + + Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)trans); +} void M_Setup_Draw (void) { - qpic_t *p; + cachepic_t *p; - M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/p_multi.lmp"); - M_DrawPic ( (320-p->width)/2, 4, p); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); M_Print (64, 40, "Hostname"); M_DrawTextBox (160, 32, 16, 1); @@ -985,11 +998,11 @@ void M_Setup_Draw (void) M_DrawTextBox (64, 140-8, 14, 1); M_Print (72, 140, "Accept Changes"); - p = Draw_CachePic ("gfx/bigbox.lmp"); - M_DrawPic (160, 64, p); - p = Draw_CachePic ("gfx/menuplyr.lmp"); - M_BuildTranslationTable(setup_top*16, setup_bottom*16); - M_DrawPicTranslate (172, 72, p); + M_DrawPic (160, 64, "gfx/bigbox.lmp"); + + // LordHavoc: rewrote this code greatly + M_MenuPlayerTranslate (translationTable, setup_top, setup_bottom); + M_DrawPic (172, 72, "gfx/menuplyr.lmp"); M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1)); @@ -1100,14 +1113,14 @@ forward: } } - 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; + setup_bottom = 15; } //============================================================================= @@ -1148,32 +1161,29 @@ void M_Menu_Net_f (void) void M_Net_Draw (void) { int f; - qpic_t *p; + cachepic_t *p; - M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/p_multi.lmp"); - M_DrawPic ( (320-p->width)/2, 4, p); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); f = 32; if (ipxAvailable) - p = Draw_CachePic ("gfx/netmen3.lmp"); + M_DrawPic (72, f, "gfx/netmen3.lmp"); else - p = Draw_CachePic ("gfx/dim_ipx.lmp"); - M_DrawPic (72, f, p); + M_DrawPic (72, f, "gfx/dim_ipx.lmp"); f += 19; if (tcpipAvailable) - p = Draw_CachePic ("gfx/netmen4.lmp"); + M_DrawPic (72, f, "gfx/netmen4.lmp"); else - p = Draw_CachePic ("gfx/dim_tcp.lmp"); - M_DrawPic (72, f, p); + M_DrawPic (72, f, "gfx/dim_tcp.lmp"); if (m_net_items == 5) // JDC, could just be removed { f += 19; - p = Draw_CachePic ("gfx/netmen5.lmp"); - M_DrawPic (72, f, p); + M_DrawPic (72, f, "gfx/netmen5.lmp"); } f = (320-26*8)/2; @@ -1183,7 +1193,7 @@ void M_Net_Draw (void) M_Print (f, 150, net_helpMessage[m_net_cursor*4+1]); f = (int)(realtime * 10)%6; - M_DrawPic (54, 32 + m_net_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) ); + M_DrawPic (54, 32 + m_net_cursor * 20, va("gfx/menudot%i.lmp", f+1)); } @@ -1236,10 +1246,34 @@ again: //============================================================================= /* OPTIONS MENU */ -#define OPTIONS_ITEMS (vid_menudrawfn ? 24 : 23) - #define SLIDER_RANGE 10 +void M_DrawSlider (int x, int y, float range) +{ + int i; + + if (range < 0) + range = 0; + if (range > 1) + range = 1; + M_DrawCharacter (x-8, y, 128); + for (i=0 ; i 200) { - Cvar_SetValue ("cl_forwardspeed", 200); - Cvar_SetValue ("cl_backspeed", 200); + Cvar_SetValueQuick (&cl_forwardspeed, 200); + Cvar_SetValueQuick (&cl_backspeed, 200); } else { - Cvar_SetValue ("cl_forwardspeed", 400); - Cvar_SetValue ("cl_backspeed", 400); + Cvar_SetValueQuick (&cl_forwardspeed, 400); + Cvar_SetValueQuick (&cl_backspeed, 400); } break; - - case 15: // lookspring - Cvar_SetValue ("lookspring", !lookspring.value); + case 22: // lookspring + Cvar_SetValueQuick (&lookspring, !lookspring.integer); break; - - case 16: // lookstrafe - Cvar_SetValue ("lookstrafe", !lookstrafe.value); + case 23: // lookstrafe + Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer); break; - - case 17: // mouse speed - Cvar_SetValue ("sensitivity", bound(1, sensitivity.value + dir * 0.5, 50)); + case 24: // mouse speed + Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50)); break; - - case 18: // mouse look - Cvar_SetValue ("freelook", !freelook.value); + case 25: // mouse look + Cvar_SetValueQuick (&freelook, !freelook.integer); break; - - case 19: // invert mouse - Cvar_SetValue ("m_pitch", -m_pitch.value); + case 26: // invert mouse + Cvar_SetValueQuick (&m_pitch, -m_pitch.value); break; - - case 20: // windowed mouse - Cvar_SetValue ("vid_mouse", !vid_mouse.value); - break; - - case 21: - Cvar_SetValue ("crosshair", bound(0, crosshair.value + dir, 5)); - break; - - case 22: // show framerate - Cvar_SetValue ("showfps", !showfps.value); + case 27: // windowed mouse + Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer); break; } } - -void M_DrawSlider (int x, int y, float range) -{ - int i; - - if (range < 0) - range = 0; - if (range > 1) - range = 1; - M_DrawCharacter (x-8, y, 128); - for (i=0 ; iwidth)/2, 4, p); + 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, "Hidden Surface Removal");M_DrawCheckbox(220, y, r_ser.value);y += 8; - M_Print(16, y, " Overbright Rendering");M_DrawCheckbox(220, y, gl_lightmode.value);y += 8; - M_Print(16, y, " Sky Quality");M_DrawSlider(220, y, r_skyquality.value / 4);y += 8; - M_Print(16, y, " Hardware Gamma");M_DrawSlider(220, y, (vid_gamma.value - 1) / 4);y += 8; - M_Print(16, y, " Hardware Brightness");M_DrawSlider(220, y, (vid_brightness.value - 1) / 4);y += 8; - M_Print(16, y, " Hardware Contrast");M_DrawSlider(220, y, (vid_contrast.value - 0.2) / 0.8);y += 8; - M_Print(16, y, " Software Brightness");M_DrawSlider(220, y, (r_brightness.value - 1) / 4);y += 8; - M_Print(16, y, " Software Contrast");M_DrawSlider(220, y, (r_contrast.value - 0.2) / 0.8);y += 8; - M_Print(16, y, " CD Music Volume");M_DrawSlider(220, y, bgmvolume.value);y += 8; - M_Print(16, y, " Sound Volume");M_DrawSlider(220, y, volume.value);y += 8; + M_Print(16, y, " Sky");M_DrawCheckbox(220, y, r_sky.integer);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, " 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.value);y += 8; - M_Print(16, y, " Lookstrafe");M_DrawCheckbox(220, y, lookstrafe.value);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.value);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.value);y += 8; - M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value / 5);y += 8; - M_Print(16, y, " Show Framerate");M_DrawCheckbox(220, y, showfps.value);y += 8; - if (vid_menudrawfn) - M_Print(16, y, " Video Options"); - 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)); @@ -1444,12 +1441,15 @@ void M_Options_Key (int k) case 2: Cbuf_AddText ("exec default.cfg\n"); break; - default: - // this is really just another case, but since it is calculated... - if (vid_menudrawfn && options_cursor == (OPTIONS_ITEMS - 1)) + case 3: + if (vid_menudrawfn) M_Menu_Video_f (); - else - M_AdjustSliders (1); + break; + case 4: + M_Menu_Options_Effects_f (); + break; + default: + M_Menu_Options_AdjustSliders (1); break; } return; @@ -1469,11 +1469,165 @@ void M_Options_Key (int k) break; case K_LEFTARROW: - M_AdjustSliders (-1); + M_Menu_Options_AdjustSliders (-1); + break; + + case K_RIGHTARROW: + M_Menu_Options_AdjustSliders (1); + break; + } +} + +#define OPTIONS_EFFECTS_ITEMS 16 + +int options_effects_cursor; + +void M_Menu_Options_Effects_f (void) +{ + key_dest = key_menu; + m_state = m_options_effects; + m_entersound = true; +} + + +extern cvar_t r_detailtextures; +extern cvar_t cl_particles; +extern cvar_t cl_explosions; +extern cvar_t cl_stainmaps; +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_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) +{ + S_LocalSound ("misc/menu3.wav"); + + switch (options_effects_cursor) + { + case 0: + Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8)); + break; + case 1: + Cvar_SetValueQuick (&r_dlightmap, !r_dlightmap.integer); + break; + case 2: + Cvar_SetValueQuick (&r_coronas, !r_coronas.integer); + break; + case 3: + Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer); + break; + case 4: + Cvar_SetValueQuick (&cl_particles, !cl_particles.integer); + break; + case 5: + Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer); + break; + case 6: + Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer); + break; + case 7: + Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer); + break; + case 8: + Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer); + break; + case 9: + Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer); + break; + case 10: + Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer); + break; + case 11: + Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer); + break; + case 12: + Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer); + break; + case 13: + 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: + Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1)); + break; + } +} + +void M_Options_Effects_Draw (void) +{ + float y; + cachepic_t *p; + + 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, " 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) / 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)); +} + + +void M_Options_Effects_Key (int k) +{ + switch (k) + { + case K_ESCAPE: + M_Menu_Options_f (); + break; + + case K_ENTER: + M_Menu_Options_Effects_AdjustSliders (1); + break; + + case K_UPARROW: + S_LocalSound ("misc/menu1.wav"); + options_effects_cursor--; + if (options_effects_cursor < 0) + options_effects_cursor = OPTIONS_EFFECTS_ITEMS-1; + break; + + case K_DOWNARROW: + S_LocalSound ("misc/menu1.wav"); + options_effects_cursor++; + if (options_effects_cursor >= OPTIONS_EFFECTS_ITEMS) + options_effects_cursor = 0; + break; + + case K_LEFTARROW: + M_Menu_Options_Effects_AdjustSliders (-1); break; case K_RIGHTARROW: - M_AdjustSliders (1); + M_Menu_Options_Effects_AdjustSliders (1); break; } } @@ -1481,10 +1635,11 @@ void M_Options_Key (int k) //============================================================================= /* KEYS MENU */ -char *bindnames[][2] = +char *quakebindnames[][2] = { {"+attack", "attack"}, -{"impulse 10", "change weapon"}, +{"impulse 10", "next weapon"}, +{"impulse 12", "previous weapon"}, {"+jump", "jump / swim up"}, {"+forward", "walk forward"}, {"+back", "backpedal"}, @@ -1503,7 +1658,133 @@ char *bindnames[][2] = {"+movedown", "swim down"} }; -#define NUMCOMMANDS (sizeof(bindnames)/sizeof(bindnames[0])) +char *transfusionbindnames[][2] = +{ +{"+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"} +}; + +int numcommands; +char *(*bindnames)[2]; + +/* +typedef struct binditem_s +{ + char *command, *description; + struct binditem_s *next; +} +binditem_t; + +typedef struct bindcategory_s +{ + char *name; + binditem_t *binds; + struct bindcategory_s *next; +} +bindcategory_t; + +bindcategory_t *bindcategories = NULL; + +void M_ClearBinds (void) +{ + for (c = bindcategories;c;c = cnext) + { + cnext = c->next; + for (b = c->binds;b;b = bnext) + { + bnext = b->next; + Z_Free(b); + } + Z_Free(c); + } + bindcategories = NULL; +} + +void M_AddBindToCategory(bindcategory_t *c, char *command, char *description) +{ + for (b = &c->binds;*b;*b = &(*b)->next); + *b = Z_Alloc(sizeof(binditem_t) + strlen(command) + 1 + strlen(description) + 1); + *b->command = (char *)((*b) + 1); + *b->description = *b->command + strlen(command) + 1; + strcpy(*b->command, command); + strcpy(*b->description, description); +} + +void M_AddBind (char *category, char *command, char *description) +{ + for (c = &bindcategories;*c;c = &(*c)->next) + { + if (!strcmp(category, (*c)->name)) + { + M_AddBindToCategory(*c, command, description); + return; + } + } + *c = Z_Alloc(sizeof(bindcategory_t)); + M_AddBindToCategory(*c, command, description); +} + +void M_DefaultBinds (void) +{ + M_ClearBinds(); + M_AddBind("movement", "+jump", "jump / swim up"); + M_AddBind("movement", "+forward", "walk forward"); + M_AddBind("movement", "+back", "backpedal"); + M_AddBind("movement", "+left", "turn left"); + M_AddBind("movement", "+right", "turn right"); + M_AddBind("movement", "+speed", "run"); + M_AddBind("movement", "+moveleft", "step left"); + M_AddBind("movement", "+moveright", "step right"); + M_AddBind("movement", "+strafe", "sidestep"); + M_AddBind("movement", "+lookup", "look up"); + M_AddBind("movement", "+lookdown", "look down"); + M_AddBind("movement", "centerview", "center view"); + M_AddBind("movement", "+mlook", "mouse look"); + M_AddBind("movement", "+klook", "keyboard look"); + M_AddBind("movement", "+moveup", "swim up"); + M_AddBind("movement", "+movedown", "swim down"); + M_AddBind("weapons", "+attack", "attack"); + M_AddBind("weapons", "impulse 10", "next weapon"); + M_AddBind("weapons", "impulse 12", "previous weapon"); + M_AddBind("weapons", "impulse 1", "select weapon 1 (axe)"); + M_AddBind("weapons", "impulse 2", "select weapon 2 (shotgun)"); + M_AddBind("weapons", "impulse 3", "select weapon 3 (super )"); + M_AddBind("weapons", "impulse 4", "select weapon 4 (nailgun)"); + M_AddBind("weapons", "impulse 5", "select weapon 5 (super nailgun)"); + M_AddBind("weapons", "impulse 6", "select weapon 6 (grenade launcher)"); + M_AddBind("weapons", "impulse 7", "select weapon 7 (rocket launcher)"); + M_AddBind("weapons", "impulse 8", "select weapon 8 (lightning gun)"); +} +*/ + int keys_cursor; int bind_grab; @@ -1515,16 +1796,17 @@ void M_Menu_Keys_f (void) m_entersound = true; } +#define NUMKEYS 5 -void M_FindKeysForCommand (char *command, int *twokeys) +void M_FindKeysForCommand (char *command, int *keys) { int count; int j; - int l; char *b; - twokeys[0] = twokeys[1] = -1; - l = strlen(command); + for (j = 0;j < NUMKEYS;j++) + keys[j] = -1; + count = 0; for (j=0 ; j<256 ; j++) @@ -1532,11 +1814,10 @@ void M_FindKeysForCommand (char *command, int *twokeys) b = keybindings[j]; if (!b) continue; - if (!strncmp (b, command, l) ) + if (!strcmp (b, command) ) { - twokeys[count] = j; - count++; - if (count == 2) + keys[count++] = j; + if (count == NUMKEYS) break; } } @@ -1545,17 +1826,14 @@ void M_FindKeysForCommand (char *command, int *twokeys) void M_UnbindCommand (char *command) { int j; - int l; char *b; - l = strlen(command); - for (j=0 ; j<256 ; j++) { b = keybindings[j]; if (!b) continue; - if (!strncmp (b, command, l) ) + if (!strcmp (b, command)) Key_SetBinding (j, ""); } } @@ -1563,14 +1841,14 @@ void M_UnbindCommand (char *command) void M_Keys_Draw (void) { - int i, l; - int keys[2]; - char *name; - int x, y; - qpic_t *p; + int i, j; + int keys[NUMKEYS]; + int y; + cachepic_t *p; + char keystring[1024]; p = Draw_CachePic ("gfx/ttl_cstm.lmp"); - M_DrawPic ( (320-p->width)/2, 4, p); + M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp"); if (bind_grab) M_Print (12, 32, "Press a key or button for this action"); @@ -1578,44 +1856,44 @@ void M_Keys_Draw (void) M_Print (18, 32, "Enter to change, backspace to clear"); // search for known bindings - for (i=0 ; i 0) + strcat(keystring, " or "); + strcat(keystring, Key_KeynumToString (keys[j])); + } } } + M_Print (150, y, keystring); } if (bind_grab) - M_DrawCharacter (130, 48 + keys_cursor*8, '='); + M_DrawCharacter (140, 48 + keys_cursor*8, '='); else - M_DrawCharacter (130, 48 + keys_cursor*8, 12+((int)(realtime*4)&1)); + M_DrawCharacter (140, 48 + keys_cursor*8, 12+((int)(realtime*4)&1)); } void M_Keys_Key (int k) { char cmd[80]; - int keys[2]; + int keys[NUMKEYS]; if (bind_grab) { // defining a key @@ -1624,7 +1902,7 @@ void M_Keys_Key (int k) { bind_grab = false; } - else if (k != '`') + else //if (k != '`') { sprintf (cmd, "bind \"%s\" \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor][0]); Cbuf_InsertText (cmd); @@ -1645,21 +1923,21 @@ void M_Keys_Key (int k) S_LocalSound ("misc/menu1.wav"); keys_cursor--; if (keys_cursor < 0) - keys_cursor = NUMCOMMANDS-1; + keys_cursor = numcommands-1; break; case K_DOWNARROW: case K_RIGHTARROW: S_LocalSound ("misc/menu1.wav"); keys_cursor++; - if (keys_cursor >= NUMCOMMANDS) + if (keys_cursor >= numcommands) keys_cursor = 0; break; case K_ENTER: // go into bind mode M_FindKeysForCommand (bindnames[keys_cursor][0], keys); S_LocalSound ("misc/menu2.wav"); - if (keys[1] != -1) + if (keys[NUMKEYS - 1] != -1) M_UnbindCommand (bindnames[keys_cursor][0]); bind_grab = true; break; @@ -1713,7 +1991,7 @@ void M_Menu_Help_f (void) void M_Help_Draw (void) { - M_DrawPic (0, 0, Draw_CachePic ( va("gfx/help%i.lmp", help_page)) ); + M_DrawPic (0, 0, va("gfx/help%i.lmp", help_page)); } @@ -1749,7 +2027,6 @@ int msgNumber; int m_quit_prevstate; qboolean wasInMenus; -//#ifndef _WIN32 char *quitMessage [] = { /* .........1.........2.... */ @@ -1758,7 +2035,7 @@ char *quitMessage [] = " this game just like ", " everything else? ", " ", - + " Milord, methinks that ", " thou art a lowly ", " quitter. Is this true? ", @@ -1773,7 +2050,7 @@ char *quitMessage [] = " 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 ", @@ -1788,7 +2065,7 @@ char *quitMessage [] = " 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! ", @@ -1816,7 +2093,6 @@ char *quitMessage [] = " constructive? ", " ", }; -//#endif void M_Menu_Quit_f (void) { @@ -1852,7 +2128,6 @@ void M_Quit_Key (int key) case 'Y': case 'y': - key_dest = key_console; Host_Quit_f (); break; @@ -1865,54 +2140,19 @@ void M_Quit_Key (int key) void M_Quit_Draw (void) { - if (wasInMenus) - { - m_state = m_quit_prevstate; -// m_recursiveDraw = true; - M_Draw (); - m_state = m_quit; - } - -/* -#ifdef _WIN32 - M_DrawTextBox (0, 0, 38, 23); - M_PrintWhite (16, 12, " Quake version 1.09 by id Software\n\n"); - M_PrintWhite (16, 28, "Programming Art \n"); - M_Print (16, 36, " John Carmack Adrian Carmack\n"); - M_Print (16, 44, " Michael Abrash Kevin Cloud\n"); - M_Print (16, 52, " John Cash Paul Steed\n"); - M_Print (16, 60, " Dave 'Zoid' Kirsch\n"); - M_PrintWhite (16, 68, "Design Biz\n"); - M_Print (16, 76, " John Romero Jay Wilbur\n"); - M_Print (16, 84, " Sandy Petersen Mike Wilson\n"); - M_Print (16, 92, " American McGee Donna Jackson\n"); - M_Print (16, 100, " Tim Willits Todd Hollenshead\n"); - M_PrintWhite (16, 108, "Support Projects\n"); - M_Print (16, 116, " Barrett Alexander Shawn Green\n"); - M_PrintWhite (16, 124, "Sound Effects\n"); - M_Print (16, 132, " Trent Reznor and Nine Inch Nails\n\n"); - M_PrintWhite (16, 140, "Quake is a trademark of Id Software,\n"); - M_PrintWhite (16, 148, "inc., (c)1996 Id Software, inc. All\n"); - M_PrintWhite (16, 156, "rights reserved. NIN logo is a\n"); - M_PrintWhite (16, 164, "registered trademark licensed to\n"); - M_PrintWhite (16, 172, "Nothing Interactive, Inc. All rights\n"); - M_PrintWhite (16, 180, "reserved. Press y to exit\n"); -#else -*/ 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]); -//#endif } //============================================================================= /* LAN CONFIG MENU */ int lanConfig_cursor = -1; -int lanConfig_cursor_table [] = {72, 92, 124}; -#define NUM_LANCONFIG_CMDS 3 +int lanConfig_cursor_table [] = {72, 92, 112, 144}; +#define NUM_LANCONFIG_CMDS 4 int lanConfig_port; char lanConfig_portname[6]; @@ -1942,15 +2182,15 @@ void M_Menu_LanConfig_f (void) void M_LanConfig_Draw (void) { - qpic_t *p; + cachepic_t *p; int basex; char *startJoin; char *protocol; - M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/p_multi.lmp"); basex = (320-p->width)/2; - M_DrawPic (basex, 4, p); + M_DrawPic (basex, 4, "gfx/p_multi.lmp"); if (StartingGame) startJoin = "New Game"; @@ -1976,9 +2216,10 @@ void M_LanConfig_Draw (void) if (JoiningGame) { M_Print (basex, lanConfig_cursor_table[1], "Search for local games..."); - M_Print (basex, 108, "Join game at:"); - M_DrawTextBox (basex+8, lanConfig_cursor_table[2]-8, 22, 1); - M_Print (basex+16, lanConfig_cursor_table[2], lanConfig_joinname); + M_Print (basex, lanConfig_cursor_table[2], "Search for internet games..."); + M_Print (basex, 128, "Join game at:"); + M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, 22, 1); + M_Print (basex+16, lanConfig_cursor_table[3], lanConfig_joinname); } else { @@ -1991,11 +2232,11 @@ void M_LanConfig_Draw (void) if (lanConfig_cursor == 0) M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [0], 10+((int)(realtime*4)&1)); - if (lanConfig_cursor == 2) - M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [2], 10+((int)(realtime*4)&1)); + if (lanConfig_cursor == 3) + M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [3], 10+((int)(realtime*4)&1)); if (*m_return_reason) - M_PrintWhite (basex, 148, m_return_reason); + M_PrintWhite (basex, 168, m_return_reason); } @@ -2031,18 +2272,21 @@ void M_LanConfig_Key (int key) M_ConfigureNetSubsystem (); - if (lanConfig_cursor == 1) + if (lanConfig_cursor == 1 || lanConfig_cursor == 2) { if (StartingGame) { M_Menu_GameOptions_f (); break; } - M_Menu_Search_f(); + if (lanConfig_cursor == 1) + M_Menu_Search_f(); + else + M_Menu_InetSearch_f(); break; } - if (lanConfig_cursor == 2) + if (lanConfig_cursor == 3) { m_return_state = m_state; m_return_onerror = true; @@ -2061,7 +2305,7 @@ void M_LanConfig_Key (int key) lanConfig_portname[strlen(lanConfig_portname)-1] = 0; } - if (lanConfig_cursor == 2) + if (lanConfig_cursor == 3) { if (strlen(lanConfig_joinname)) lanConfig_joinname[strlen(lanConfig_joinname)-1] = 0; @@ -2072,7 +2316,7 @@ void M_LanConfig_Key (int key) if (key < 32 || key > 127) break; - if (lanConfig_cursor == 2) + if (lanConfig_cursor == 3) { l = strlen(lanConfig_joinname); if (l < 21) @@ -2095,7 +2339,7 @@ void M_LanConfig_Key (int key) } } - if (StartingGame && lanConfig_cursor == 2) + if (StartingGame && lanConfig_cursor == 3) { if (key == K_UPARROW) lanConfig_cursor = 1; @@ -2120,7 +2364,23 @@ typedef struct char *description; } level_t; -level_t levels[] = +typedef struct +{ + char *description; + int firstLevel; + int levels; +} episode_t; + +typedef struct +{ + char *gamename; + level_t *levels; + episode_t *episodes; + int numepisodes; +} +gamelevels_t; + +level_t quakelevels[] = { {"start", "Entrance"}, // 0 @@ -2168,6 +2428,17 @@ level_t levels[] = {"dm6", "The Dark Zone"} }; +episode_t quakeepisodes[] = +{ + {"Welcome to Quake", 0, 1}, + {"Doomed Dimension", 1, 8}, + {"Realm of Black Magic", 9, 7}, + {"Netherworld", 16, 7}, + {"The Elder World", 23, 8}, + {"Final Level", 31, 1}, + {"Deathmatch Arena", 32, 6} +}; + //MED 01/06/97 added hipnotic levels level_t hipnoticlevels[] = { @@ -2196,6 +2467,17 @@ level_t hipnoticlevels[] = {"hipdm1", "The Edge of Oblivion"} // 17 }; +//MED 01/06/97 added hipnotic episodes +episode_t hipnoticepisodes[] = +{ + {"Scourge of Armagon", 0, 1}, + {"Fortress of the Dead", 1, 5}, + {"Dominion of Darkness", 6, 6}, + {"The Rift", 12, 4}, + {"Final Level", 16, 1}, + {"Deathmatch Arena", 17, 1} +}; + //PGM 01/07/97 added rogue levels //PGM 03/02/97 added dmatch level level_t roguelevels[] = @@ -2219,35 +2501,6 @@ level_t roguelevels[] = {"ctf1", "Division of Change"} }; -typedef struct -{ - char *description; - int firstLevel; - int levels; -} episode_t; - -episode_t episodes[] = -{ - {"Welcome to Quake", 0, 1}, - {"Doomed Dimension", 1, 8}, - {"Realm of Black Magic", 9, 7}, - {"Netherworld", 16, 7}, - {"The Elder World", 23, 8}, - {"Final Level", 31, 1}, - {"Deathmatch Arena", 32, 6} -}; - -//MED 01/06/97 added hipnotic episodes -episode_t hipnoticepisodes[] = -{ - {"Scourge of Armagon", 0, 1}, - {"Fortress of the Dead", 1, 5}, - {"Dominion of Darkness", 6, 6}, - {"The Rift", 12, 4}, - {"Final Level", 16, 1}, - {"Deathmatch Arena", 17, 1} -}; - //PGM 01/07/97 added rogue episodes //PGM 03/02/97 added dmatch episode episode_t rogueepisodes[] = @@ -2289,6 +2542,92 @@ episode_t nehahraepisodes[] = {"Dimension of the Lost", 17, 2} }; +// Map list for Transfusion +level_t transfusionlevels[] = +{ + {"bb1", "The Stronghold"}, + {"bb2", "Winter Wonderland"}, + {"bb3", "Bodies"}, + {"bb4", "The Tower"}, + {"bb5", "Click!"}, + {"bb6", "Twin Fortress"}, + {"bb7", "Midgard"}, + {"bb8", "Fun With Heads"}, + + {"e1m1", "Cradle to Grave"}, + {"e1m2", "Wrong Side of the Tracks"}, + {"e1m7", "Altar of Stone"}, + + {"dm1", "Monolith Building 11"}, + {"dm2", "Power!"}, + {"dm3", "Area 15"}, + {"e6m8", "Beauty and the Beast"}, + + {"cpbb01", "Crypt of Despair"}, + {"cpbb03", "Unholy Cathedral"}, + + {"b2a15", "Area 15 (B2)"}, + {"barena", "Blood Arena"}, + {"bkeep", "Blood Keep"}, + {"bstar", "Brown Star"}, + {"crypt", "The Crypt"}, + + {"bb3_2k1", "Bodies Infusion"}, + {"dcamp", "DeathCamp"}, + {"dranzbb6", "Black Coffee"}, + {"highnoon", "HighNoon"}, + {"qbb1", "The Confluence"}, + {"qbb2", "KathartiK"}, + {"qbb3", "Caleb's Woodland Retreat"}, + {"qe1m7", "The House of Chthon"}, + {"simple", "Dead Simple"} +}; + +episode_t transfusionepisodes[] = +{ + {"Blood", 0, 8}, + {"Blood Single Player", 8, 3}, + {"Plasma Pack", 11, 4}, + {"Cryptic Passage", 15, 2}, + {"Blood 2", 17, 5}, + {"Custom", 22, 9} +}; + +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 roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4}; +gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4}; +gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 6}; + +typedef struct +{ + int gameid; + gamelevels_t *notregistered; + gamelevels_t *registered; +} +gameinfo_t; + +gameinfo_t gamelist[] = +{ + {GAME_NORMAL, &sharewarequakegame, ®isteredquakegame}, + {GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame}, + {GAME_ROGUE, &roguegame, &roguegame}, + {GAME_NEHAHRA, &nehahragame, &nehahragame}, + {GAME_TRANSFUSION, &transfusiongame, &transfusiongame}, + {-1, &sharewarequakegame, ®isteredquakegame} // final fallback +}; + +gamelevels_t *lookupgameinfo(void) +{ + int i; + for (i = 0;gamelist[i].gameid >= 0 && gamelist[i].gameid != gamemode;i++); + if (registered.integer) + return gamelist[i].registered; + else + return gamelist[i].notregistered; +} + int startepisode; int startlevel; int maxplayers; @@ -2303,7 +2642,7 @@ void M_Menu_GameOptions_f (void) if (maxplayers == 0) maxplayers = svs.maxclients; if (maxplayers < 2) - maxplayers = svs.maxclientslimit; + maxplayers = MAX_SCOREBOARD; } @@ -2313,12 +2652,13 @@ int gameoptions_cursor; void M_GameOptions_Draw (void) { - qpic_t *p; + cachepic_t *p; int x; + gamelevels_t *g; - M_DrawPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") ); + M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/p_multi.lmp"); - M_DrawPic ( (320-p->width)/2, 4, p); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); M_DrawTextBox (152, 32, 10, 1); M_Print (160, 40, "begin game"); @@ -2327,19 +2667,31 @@ void M_GameOptions_Draw (void) M_Print (160, 56, va("%i", maxplayers) ); M_Print (0, 64, " Game Type"); - if (!coop.value && !deathmatch.value) - Cvar_SetValue("deathmatch", 1); - if (coop.value) - M_Print (160, 64, "Cooperative"); + 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 - M_Print (160, 64, "Deathmatch"); + { + 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 (0, 72, " Teamplay"); - if (rogue) + if (gamemode == GAME_ROGUE) { char *msg; - switch((int)teamplay.value) + switch((int)teamplay.integer) { case 1: msg = "No Friendly Fire"; break; case 2: msg = "Friendly Fire"; break; @@ -2351,11 +2703,23 @@ void M_GameOptions_Draw (void) } M_Print (160, 72, msg); } + else if (gamemode == GAME_TRANSFUSION) + { + 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); + } else { char *msg; - switch((int)teamplay.value) + switch((int)teamplay.integer) { case 1: msg = "No Friendly Fire"; break; case 2: msg = "Friendly Fire"; break; @@ -2365,62 +2729,35 @@ void M_GameOptions_Draw (void) } M_Print (0, 80, " Skill"); - if (skill.value == 0) + if (skill.integer == 0) M_Print (160, 80, "Easy difficulty"); - else if (skill.value == 1) + else if (skill.integer == 1) M_Print (160, 80, "Normal difficulty"); - else if (skill.value == 2) + 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.value == 0) + if (fraglimit.integer == 0) M_Print (160, 88, "none"); else - M_Print (160, 88, va("%i frags", (int)fraglimit.value)); + M_Print (160, 88, va("%i frags", fraglimit.integer)); M_Print (0, 96, " Time Limit"); - if (timelimit.value == 0) + if (timelimit.integer == 0) M_Print (160, 96, "none"); else - M_Print (160, 96, va("%i minutes", (int)timelimit.value)); + M_Print (160, 96, va("%i minutes", timelimit.integer)); + + g = lookupgameinfo(); M_Print (0, 112, " Episode"); - //MED 01/06/97 added hipnotic episodes - if (hipnotic) - M_Print (160, 112, hipnoticepisodes[startepisode].description); - //PGM 01/07/97 added rogue episodes - else if (rogue) - M_Print (160, 112, rogueepisodes[startepisode].description); - else if (nehahra) - M_Print (160, 112, nehahraepisodes[startepisode].description); - else - M_Print (160, 112, episodes[startepisode].description); + M_Print (160, 112, g->episodes[startepisode].description); M_Print (0, 120, " Level"); - //MED 01/06/97 added hipnotic episodes - if (hipnotic) - { - M_Print (160, 120, hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].description); - M_Print (160, 128, hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].name); - } - //PGM 01/07/97 added rogue episodes - else if (rogue) - { - M_Print (160, 120, roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].description); - M_Print (160, 128, roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].name); - } - else if (nehahra) - { - M_Print (160, 120, nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].description); - M_Print (160, 128, nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].name); - } - else - { - M_Print (160, 120, levels[episodes[startepisode].firstLevel + startlevel].description); - M_Print (160, 128, levels[episodes[startepisode].firstLevel + startlevel].name); - } + M_Print (160, 120, g->levels[g->episodes[startepisode].firstLevel + startlevel].description); + M_Print (160, 128, g->levels[g->episodes[startepisode].firstLevel + startlevel].name); // line cursor M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1)); @@ -2436,12 +2773,6 @@ void M_GameOptions_Draw (void) M_Print (x, 154, " First, question your "); M_Print (x, 162, " sanity, then email "); M_Print (x, 170, " havoc@gamevisions.com "); - /* - M_Print (x, 146, " More than 4 players "); - M_Print (x, 154, " requires using command "); - M_Print (x, 162, "line parameters; please "); - M_Print (x, 170, " see techinfo.txt. "); - */ } else { @@ -2453,15 +2784,16 @@ void M_GameOptions_Draw (void) void M_NetStart_Change (int dir) { + gamelevels_t *g; int count; switch (gameoptions_cursor) { case 1: maxplayers += dir; - if (maxplayers > svs.maxclientslimit) + if (maxplayers > MAX_SCOREBOARD) { - maxplayers = svs.maxclientslimit; + maxplayers = MAX_SCOREBOARD; m_serverInfoMessage = true; m_serverInfoMessageTime = realtime; } @@ -2470,75 +2802,73 @@ void M_NetStart_Change (int dir) break; case 2: - if (deathmatch.value) // changing from deathmatch to coop + if (gamemode == GAME_TRANSFUSION) { - Cvar_SetValue ("coop", 1); - Cvar_SetValue ("deathmatch", 0); + if (deathmatch.integer == 2) // changing from CTF to BloodBath + Cvar_SetValueQuick (&deathmatch, 0); + else // changing from BloodBath to CTF + Cvar_SetValueQuick (&deathmatch, 2); } - else // changing from coop to deathmatch + else { - Cvar_SetValue ("coop", 0); - Cvar_SetValue ("deathmatch", 1); + if (deathmatch.integer) // changing from deathmatch to coop + { + Cvar_SetValueQuick (&coop, 1); + Cvar_SetValueQuick (&deathmatch, 0); + } + else // changing from coop to deathmatch + { + Cvar_SetValueQuick (&coop, 0); + Cvar_SetValueQuick (&deathmatch, 1); + } } break; case 3: - if (rogue) + if (gamemode == GAME_ROGUE) count = 6; else count = 2; - Cvar_SetValue ("teamplay", teamplay.value + dir); - if (teamplay.value > count) - Cvar_SetValue ("teamplay", 0); - else if (teamplay.value < 0) - Cvar_SetValue ("teamplay", count); + Cvar_SetValueQuick (&teamplay, teamplay.integer + dir); + if (teamplay.integer > count) + Cvar_SetValueQuick (&teamplay, 0); + else if (teamplay.integer < 0) + Cvar_SetValueQuick (&teamplay, count); break; case 4: - Cvar_SetValue ("skill", skill.value + dir); - if (skill.value > 3) - Cvar_SetValue ("skill", 0); - if (skill.value < 0) - Cvar_SetValue ("skill", 3); + Cvar_SetValueQuick (&skill, skill.integer + dir); + if (skill.integer > 3) + Cvar_SetValueQuick (&skill, 0); + if (skill.integer < 0) + Cvar_SetValueQuick (&skill, 3); break; case 5: - Cvar_SetValue ("fraglimit", fraglimit.value + dir*10); - if (fraglimit.value > 100) - Cvar_SetValue ("fraglimit", 0); - if (fraglimit.value < 0) - Cvar_SetValue ("fraglimit", 100); + Cvar_SetValueQuick (&fraglimit, fraglimit.integer + dir*10); + if (fraglimit.integer > 100) + Cvar_SetValueQuick (&fraglimit, 0); + if (fraglimit.integer < 0) + Cvar_SetValueQuick (&fraglimit, 100); break; case 6: - Cvar_SetValue ("timelimit", timelimit.value + dir*5); + Cvar_SetValueQuick (&timelimit, timelimit.value + dir*5); if (timelimit.value > 60) - Cvar_SetValue ("timelimit", 0); + Cvar_SetValueQuick (&timelimit, 0); if (timelimit.value < 0) - Cvar_SetValue ("timelimit", 60); + Cvar_SetValueQuick (&timelimit, 60); break; case 7: startepisode += dir; - //MED 01/06/97 added hipnotic count - if (hipnotic) - count = 6; - //PGM 01/07/97 added rogue count - //PGM 03/02/97 added 1 for dmatch episode - else if (rogue) - count = 4; - else if (nehahra) - count = 4; - else if (registered.value) - count = 7; - else - count = 2; + g = lookupgameinfo(); if (startepisode < 0) - startepisode = count - 1; + startepisode = g->numepisodes - 1; - if (startepisode >= count) + if (startepisode >= g->numepisodes) startepisode = 0; startlevel = 0; @@ -2546,21 +2876,12 @@ void M_NetStart_Change (int dir) case 8: startlevel += dir; - //MED 01/06/97 added hipnotic episodes - if (hipnotic) - count = hipnoticepisodes[startepisode].levels; - //PGM 01/06/97 added hipnotic episodes - else if (rogue) - count = rogueepisodes[startepisode].levels; - else if (nehahra) - count = nehahraepisodes[startepisode].levels; - else - count = episodes[startepisode].levels; + g = lookupgameinfo(); if (startlevel < 0) - startlevel = count - 1; + startlevel = g->episodes[startepisode].levels - 1; - if (startlevel >= count) + if (startlevel >= g->episodes[startepisode].levels) startlevel = 0; break; } @@ -2568,6 +2889,8 @@ void M_NetStart_Change (int dir) void M_GameOptions_Key (int key) { + gamelevels_t *g; + switch (key) { case K_ESCAPE: @@ -2610,17 +2933,9 @@ void M_GameOptions_Key (int key) Cbuf_AddText ("disconnect\n"); Cbuf_AddText ("listen 0\n"); // so host_netport will be re-examined Cbuf_AddText ( va ("maxplayers %u\n", maxplayers) ); -// SCR_BeginLoadingPlaque (); - - if (hipnotic) - Cbuf_AddText ( va ("map %s\n", hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].name) ); - else if (rogue) - Cbuf_AddText ( va ("map %s\n", roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].name) ); - else if (nehahra) - Cbuf_AddText ( va ("map %s\n", nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].name) ); - else - Cbuf_AddText ( va ("map %s\n", levels[episodes[startepisode].firstLevel + startlevel].name) ); + g = lookupgameinfo(); + Cbuf_AddText ( va ("map %s\n", g->levels[g->episodes[startepisode].firstLevel + startlevel].name) ); return; } @@ -2650,11 +2965,11 @@ void M_Menu_Search_f (void) void M_Search_Draw (void) { - qpic_t *p; + cachepic_t *p; int x; p = Draw_CachePic ("gfx/p_multi.lmp"); - M_DrawPic ( (320-p->width)/2, 4, p); + 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..."); @@ -2689,6 +3004,63 @@ void M_Search_Key (int key) { } +//============================================================================= +/* INTERNET SEARCH MENU */ + +void M_Menu_InetSearch_f (void) +{ + key_dest = key_menu; + m_state = m_search; + m_entersound = false; + slistSilent = true; + slistLocal = false; + searchComplete = false; + NET_InetSlist_f(); + +} + + +void M_InetSearch_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; + } + + if (hostCacheCount) + { + M_Menu_ServerList_f (); + return; + } + + M_PrintWhite ((320/2) - ((22*8)/2), 64, "No Quake servers found"); + if ((realtime - searchCompleteTime) < 3.0) + return; + + M_Menu_LanConfig_f (); +} + + +void M_InetSearch_Key (int key) +{ +} + //============================================================================= /* SLIST MENU */ @@ -2711,7 +3083,7 @@ void M_ServerList_Draw (void) { int n; char string [64]; - qpic_t *p; + cachepic_t *p; if (!slist_sorted) { @@ -2732,7 +3104,7 @@ void M_ServerList_Draw (void) } p = Draw_CachePic ("gfx/p_multi.lmp"); - M_DrawPic ( (320-p->width)/2, 4, p); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp"); for (n = 0; n < hostCacheCount; n++) { if (hostcache[n].maxusers) @@ -2744,7 +3116,7 @@ void M_ServerList_Draw (void) M_DrawCharacter (0, 32 + slist_cursor*8, 12+((int)(realtime*4)&1)); if (*m_return_reason) - M_PrintWhite (16, 148, m_return_reason); + M_PrintWhite (16, 168, m_return_reason); } @@ -2807,12 +3179,24 @@ void M_Init (void) Cmd_AddCommand ("menu_multiplayer", M_Menu_MultiPlayer_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_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 (nehahra) + if (gamemode == GAME_TRANSFUSION) + { + numcommands = sizeof(transfusionbindnames) / sizeof(transfusionbindnames[0]); + bindnames = transfusionbindnames; + } + else + { + numcommands = sizeof(quakebindnames) / sizeof(quakebindnames[0]); + bindnames = quakebindnames; + } + + if (gamemode == GAME_NEHAHRA) { if (COM_FileExists("maps/neh1m4.bsp")) { @@ -2843,26 +3227,12 @@ void M_Init (void) } } - void M_Draw (void) { if (m_state == m_none || key_dest != key_menu) return; - /* - if (!m_recursiveDraw) - { - if (scr_con_current) - { - Draw_ConsoleBackground (vid.height); - S_ExtraUpdate (); - } - } - else - { - m_recursiveDraw = false; - } - */ + M_DrawBackground(); switch (m_state) { @@ -2905,6 +3275,10 @@ void M_Draw (void) M_Options_Draw (); break; + case m_options_effects: + M_Options_Effects_Draw (); + break; + case m_keys: M_Keys_Draw (); break; @@ -2991,6 +3365,10 @@ void M_Keydown (int key) M_Options_Key (key); return; + case m_options_effects: + M_Options_Effects_Key (key); + return; + case m_keys: M_Keys_Key (key); return; @@ -3035,3 +3413,4 @@ void M_ConfigureNetSubsystem(void) if (IPXConfig || TCPIPConfig) net_hostport = lanConfig_port; } +