X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=f1f768539b31299bf25bb5f541f3090350c093e0;hp=d1cc9b7203fccc1a8c93b88a4f50fb3bf734e2f1;hb=9085903141b6ca8abcf0f518908d770e0107d378;hpb=ee4b58633525898fd35a4d5d478415a6db73b199 diff --git a/menu.c b/menu.c index d1cc9b72..f1f76853 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. @@ -42,6 +42,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); @@ -59,6 +60,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); @@ -76,6 +78,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); @@ -100,14 +103,50 @@ 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; - -demonames_t Demos[35]; + 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"} +}; float menu_x, menu_y, menu_width, menu_height; @@ -117,7 +156,6 @@ void M_DrawBackground(void) menu_height = 200; 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); } @@ -138,13 +176,6 @@ void M_DrawCharacter (float cx, float cy, int num) void M_Print (float cx, float cy, char *str) { - /* - while (*str) - { - M_DrawCharacter (cx, cy, (*str++)+128); - cx += 8; - } - */ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0); } @@ -155,17 +186,10 @@ void M_PrintWhite (float cx, float cy, char *str) void M_ItemPrint (float cx, float cy, char *str, int unghosted) { - /* - while (*str) - { - M_DrawCharacter (cx, cy, (*str++)+128); - cx += 8; - } - */ 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.7, 0.7, 0.7, 1, 0); + DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0); } void M_DrawPic (float cx, float cy, char *picname) @@ -173,13 +197,13 @@ 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); } -byte identityTable[256]; -byte translationTable[256]; +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; @@ -203,12 +227,6 @@ void M_BuildTranslationTable(int top, int bottom) } -void M_DrawPicTranslate (float cx, float cy, char *picname) -{ - DrawQ_PicTranslate (menu_x + cx, menu_y + cy, picname, translationTable); -} - - void M_DrawTextBox (float x, float y, float width, float height) { int n; @@ -289,58 +307,14 @@ void M_ToggleMenu_f (void) } } -// 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) -{ - // FIXME: handle color flashs and such when selected - M_DrawPic (item->x, item->y, item->string); -} - -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)); @@ -349,47 +323,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) @@ -404,8 +340,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: @@ -413,14 +348,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; } @@ -430,7 +365,6 @@ void M_Demo_Key (int k) /* MAIN MENU */ int m_main_cursor; -//#define MAIN_ITEMS 5 int MAIN_ITEMS = 4; // Nehahra: Menu Disable @@ -645,22 +579,43 @@ void M_Menu_SinglePlayer_f (void) void M_SinglePlayer_Draw (void) { - int f; cachepic_t *p; M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/ttl_sgl.lmp"); - M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl.lmp"); - M_DrawPic (72, 32, "gfx/sp_menu.lmp"); - f = (int)(realtime * 10)%6; + // BloodBath doesn't have a single player mode + if (gamemode == GAME_BLOODBATH) + { + M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl.lmp"); + + M_DrawTextBox (60, 8 * 8, 23, 4); + M_PrintWhite (102, 10 * 8, "BloodBath 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"); - M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1)); + f = (int)(realtime * 10)%6; + + M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1)); + } } void M_SinglePlayer_Key (int key) { + if (gamemode == GAME_BLOODBATH) + { + if (key == K_ESCAPE || key == K_ENTER) + m_state = m_main; + return; + } + switch (key) { case K_ESCAPE: @@ -818,11 +773,6 @@ void M_Load_Key (int k) m_state = m_none; key_dest = key_game; - // LordHavoc: made SCR_UpdateScreen use a great deal less stack space, no longer an issue - //// Host_Loadgame_f can't bring up the loading plaque because too much - //// stack space has been used, so do it now -//// SCR_BeginLoadingPlaque (); - // issue the load command Cbuf_AddText (va ("load s%i\n", load_cursor) ); return; @@ -980,6 +930,28 @@ void M_Menu_Setup_f (void) 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); +} void M_Setup_Draw (void) { @@ -1004,8 +976,11 @@ void M_Setup_Draw (void) M_Print (72, 140, "Accept Changes"); M_DrawPic (160, 64, "gfx/bigbox.lmp"); - M_BuildTranslationTable(setup_top*16, setup_bottom*16); - M_DrawPicTranslate (172, 72, "gfx/menuplyr.lmp"); + + // LordHavoc: rewrote this code greatly + M_BuildTranslationTable (setup_top*16, setup_bottom*16); + M_MenuPlayerTranslate (translationTable); + M_DrawPic (172, 72, "gfx/menuplyr.lmp"); M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1)); @@ -1249,10 +1224,34 @@ again: //============================================================================= /* OPTIONS MENU */ -#define OPTIONS_ITEMS 26 - #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 20: // lookspring - Cvar_SetValue ("lookspring", !lookspring.integer); + case 21: // lookspring + Cvar_SetValueQuick (&lookspring, !lookspring.integer); break; - case 21: // lookstrafe - Cvar_SetValue ("lookstrafe", !lookstrafe.integer); + case 22: // lookstrafe + Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer); break; - case 22: // mouse speed - Cvar_SetValue ("sensitivity", bound(1, sensitivity.value + dir * 0.5, 50)); + case 23: // mouse speed + Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50)); break; - case 23: // mouse look - Cvar_SetValue ("freelook", !freelook.integer); + case 24: // mouse look + Cvar_SetValueQuick (&freelook, !freelook.integer); break; - case 24: // invert mouse - Cvar_SetValue ("m_pitch", -m_pitch.value); + case 25: // invert mouse + Cvar_SetValueQuick (&m_pitch, -m_pitch.value); break; - case 25: // windowed mouse - Cvar_SetValue ("vid_mouse", !vid_mouse.integer); + case 26: // 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 ; i dist) - { - bestdist = dist; - best = i; - } - } - return i; -} - -void M_Adjust2DResolution(int dir) -{ - int i, num; - i = M_Classify2DResolution() + dir; - num = M_Num2DResolutions() - 1; - i = bound(0, i, num); - Cvar_SetValue("v_2dwidth", m_2dres[i*2]); - Cvar_SetValue("v_2dheight", m_2dres[i*2+1]); -} -*/ - void M_Options_Draw (void) { - int i; float y; cachepic_t *p; @@ -1453,20 +1364,19 @@ void M_Options_Draw (void) 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, "Hidden Surface Removal");M_DrawCheckbox(220, y, r_ser.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; - i = Cvar_FindVar("bgmvolume") != NULL; - M_ItemPrint(16, y, " CD Music Volume", i);if (i) M_DrawSlider(220, y, bgmvolume.value);y += 8; - i = Cvar_FindVar("volume") != NULL; - M_ItemPrint(16, y, " Sound Volume", i);if (i) M_DrawSlider(220, y, volume.value);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; @@ -1509,8 +1419,11 @@ void M_Options_Key (int k) if (vid_menudrawfn) M_Menu_Video_f (); break; + case 4: + M_Menu_Options_Effects_f (); + break; default: - M_AdjustSliders (1); + M_Menu_Options_AdjustSliders (1); break; } return; @@ -1530,11 +1443,140 @@ 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 11 + +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 cl_particles; +extern cvar_t cl_explosions; +extern cvar_t cl_stainmaps; +extern cvar_t r_modellights; +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 (&cl_particles, !cl_particles.integer); + break; + case 2: + Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer); + break; + case 3: + Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer); + break; + case 4: + Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer); + break; + case 5: + Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer); + break; + case 6: + Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer); + break; + case 7: + Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer); + break; + case 8: + 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: + 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, " 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)); +} + + +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; } } @@ -1544,8 +1586,41 @@ void M_Options_Key (int k) char *bindnames[][2] = { +#ifdef BLOODBATH +{"+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 BLOODBATH {"+attack", "attack"}, -{"impulse 10", "change weapon"}, +{"impulse 10", "next weapon"}, +{"impulse 12", "previous weapon"}, {"+jump", "jump / swim up"}, {"+forward", "walk forward"}, {"+back", "backpedal"}, @@ -1562,10 +1637,102 @@ char *bindnames[][2] = {"+klook", "keyboard look"}, {"+moveup", "swim up"}, {"+movedown", "swim down"} +#endif // not BLOODBATH }; #define NUMCOMMANDS (sizeof(bindnames)/sizeof(bindnames[0])) +/* +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; @@ -1576,14 +1743,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; char *b; - twokeys[0] = twokeys[1] = -1; + for (j = 0;j < NUMKEYS;j++) + keys[j] = -1; + count = 0; for (j=0 ; j<256 ; j++) @@ -1593,9 +1763,8 @@ void M_FindKeysForCommand (char *command, int *twokeys) continue; if (!strcmp (b, command) ) { - twokeys[count] = j; - count++; - if (count == 2) + keys[count++] = j; + if (count == NUMKEYS) break; } } @@ -1619,11 +1788,11 @@ void M_UnbindCommand (char *command) void M_Keys_Draw (void) { - int i, l; - int keys[2]; - char *name; - int x, y; + 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, "gfx/ttl_cstm.lmp"); @@ -1640,38 +1809,38 @@ void M_Keys_Draw (void) M_Print (16, y, bindnames[i][1]); - l = strlen (bindnames[i][0]); - M_FindKeysForCommand (bindnames[i][0], keys); + // LordHavoc: redesigned to print more than 2 keys, inspired by Tomaz's MiniRacer if (keys[0] == -1) - { - M_Print (140, y, "???"); - } + strcpy(keystring, "???"); else { - name = Key_KeynumToString (keys[0]); - M_Print (140, y, name); - x = strlen(name) * 8; - if (keys[1] != -1) + keystring[0] = 0; + for (j = 0;j < NUMKEYS;j++) { - M_Print (140 + x + 8, y, "or"); - M_Print (140 + x + 32, y, Key_KeynumToString (keys[1])); + if (keys[j] != -1) + { + if (j > 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 @@ -1680,7 +1849,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); @@ -1715,7 +1884,7 @@ void M_Keys_Key (int k) 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; @@ -1805,7 +1974,6 @@ int msgNumber; int m_quit_prevstate; qboolean wasInMenus; -//#ifndef _WIN32 char *quitMessage [] = { /* .........1.........2.... */ @@ -1829,7 +1997,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 ", @@ -1844,7 +2012,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! ", @@ -1872,7 +2040,6 @@ char *quitMessage [] = " constructive? ", " ", }; -//#endif void M_Menu_Quit_f (void) { @@ -1921,38 +2088,11 @@ void M_Quit_Key (int key) void M_Quit_Draw (void) { -/* -#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 } //============================================================================= @@ -2168,7 +2308,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 @@ -2216,6 +2372,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[] = { @@ -2244,6 +2411,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[] = @@ -2267,35 +2445,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[] = @@ -2337,6 +2486,91 @@ episode_t nehahraepisodes[] = {"Dimension of the Lost", 17, 2} }; +// Map list for BloodBath +level_t bloodbathlevels[] = +{ + {"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"}, + {"e1m7", "Altar of Stone"}, + + {"dm1", "Monolith Building 11"}, + {"dm2", "Power!"}, + {"dm3", "Area 15"}, + {"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"}, + {"bkeep", "Blood Keep"}, + {"bstar", "Brown Star"}, + {"crypt", "The Crypt"}, + + {"bb3_2k1", "Bodies Infusion"}, + {"qbb1", "The Confluence"}, + {"qbb2", "KathartiK"}, + {"qbb3", "Caleb's Woodland Retreat"}, + {"ded_simp", "Dead Simple"}, + {"dranzbb6", "Black Coffee"}, + {"qe1m7", "The House of Chthon"} +}; + +episode_t bloodbathepisodes[] = +{ + {"Blood", 0, 10}, + {"Plasma Pack", 10, 4}, + {"Cryptic Passage", 14, 4}, + {"Blood 2", 18, 5}, + {"BloodBath", 23, 7} +}; + +gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2}; +gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7}; +gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6}; +gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4}; +gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4}; +gamelevels_t bloodbathgame = {"BloodBath", bloodbathlevels, bloodbathepisodes, 5}; + +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_FIENDARENA, &sharewarequakegame, ®isteredquakegame}, + {GAME_ZYMOTIC, &sharewarequakegame, ®isteredquakegame}, + {GAME_BLOODBATH, &bloodbathgame, &bloodbathgame}, + {-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; @@ -2363,6 +2597,7 @@ void M_GameOptions_Draw (void) { cachepic_t *p; int x; + gamelevels_t *g; M_DrawPic (16, 4, "gfx/qplaque.lmp"); p = Draw_CachePic ("gfx/p_multi.lmp"); @@ -2375,12 +2610,24 @@ void M_GameOptions_Draw (void) M_Print (160, 56, va("%i", maxplayers) ); M_Print (0, 64, " Game Type"); - if (!coop.integer && !deathmatch.integer) - Cvar_SetValue("deathmatch", 1); - if (coop.integer) - M_Print (160, 64, "Cooperative"); + if (gamemode == GAME_BLOODBATH) + { + 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 (gamemode == GAME_ROGUE) @@ -2399,6 +2646,18 @@ void M_GameOptions_Draw (void) } M_Print (160, 72, msg); } + else if (gamemode == GAME_BLOODBATH) + { + 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; @@ -2434,41 +2693,14 @@ void M_GameOptions_Draw (void) else M_Print (160, 96, va("%i minutes", timelimit.integer)); + g = lookupgameinfo(); + M_Print (0, 112, " Episode"); - //MED 01/06/97 added hipnotic episodes - if (gamemode == GAME_HIPNOTIC) - M_Print (160, 112, hipnoticepisodes[startepisode].description); - //PGM 01/07/97 added rogue episodes - else if (gamemode == GAME_ROGUE) - M_Print (160, 112, rogueepisodes[startepisode].description); - else if (gamemode == GAME_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 (gamemode == GAME_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 (gamemode == GAME_ROGUE) - { - M_Print (160, 120, roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].description); - M_Print (160, 128, roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].name); - } - else if (gamemode == GAME_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)); @@ -2484,12 +2716,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 { @@ -2501,6 +2727,7 @@ void M_GameOptions_Draw (void) void M_NetStart_Change (int dir) { + gamelevels_t *g; int count; switch (gameoptions_cursor) @@ -2518,15 +2745,25 @@ void M_NetStart_Change (int dir) break; case 2: - if (deathmatch.integer) // changing from deathmatch to coop + if (gamemode == GAME_BLOODBATH) { - 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; @@ -2536,57 +2773,45 @@ void M_NetStart_Change (int dir) else count = 2; - Cvar_SetValue ("teamplay", teamplay.integer + dir); + Cvar_SetValueQuick (&teamplay, teamplay.integer + dir); if (teamplay.integer > count) - Cvar_SetValue ("teamplay", 0); + Cvar_SetValueQuick (&teamplay, 0); else if (teamplay.integer < 0) - Cvar_SetValue ("teamplay", count); + Cvar_SetValueQuick (&teamplay, count); break; case 4: - Cvar_SetValue ("skill", skill.integer + dir); + Cvar_SetValueQuick (&skill, skill.integer + dir); if (skill.integer > 3) - Cvar_SetValue ("skill", 0); + Cvar_SetValueQuick (&skill, 0); if (skill.integer < 0) - Cvar_SetValue ("skill", 3); + Cvar_SetValueQuick (&skill, 3); break; case 5: - Cvar_SetValue ("fraglimit", fraglimit.integer + dir*10); + Cvar_SetValueQuick (&fraglimit, fraglimit.integer + dir*10); if (fraglimit.integer > 100) - Cvar_SetValue ("fraglimit", 0); + Cvar_SetValueQuick (&fraglimit, 0); if (fraglimit.integer < 0) - Cvar_SetValue ("fraglimit", 100); + 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 (gamemode == GAME_HIPNOTIC) - count = 6; - //PGM 01/07/97 added rogue count - //PGM 03/02/97 added 1 for dmatch episode - else if (gamemode == GAME_ROGUE) - count = 4; - else if (gamemode == GAME_NEHAHRA) - count = 4; - else if (registered.integer) - 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; @@ -2594,21 +2819,12 @@ void M_NetStart_Change (int dir) case 8: startlevel += dir; - //MED 01/06/97 added hipnotic episodes - if (gamemode == GAME_HIPNOTIC) - count = hipnoticepisodes[startepisode].levels; - //PGM 01/06/97 added hipnotic episodes - else if (gamemode == GAME_ROGUE) - count = rogueepisodes[startepisode].levels; - else if (gamemode == GAME_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; } @@ -2616,6 +2832,8 @@ void M_NetStart_Change (int dir) void M_GameOptions_Key (int key) { + gamelevels_t *g; + switch (key) { case K_ESCAPE: @@ -2658,17 +2876,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 (gamemode == GAME_HIPNOTIC) - Cbuf_AddText ( va ("map %s\n", hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].name) ); - else if (gamemode == GAME_ROGUE) - Cbuf_AddText ( va ("map %s\n", roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].name) ); - else if (gamemode == GAME_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; } @@ -2855,6 +3065,7 @@ 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); @@ -2939,6 +3150,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; @@ -3025,6 +3240,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; @@ -3069,3 +3288,4 @@ void M_ConfigureNetSubsystem(void) if (IPXConfig || TCPIPConfig) net_hostport = lanConfig_port; } +