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.
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);
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);
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);
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);
}
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);
}
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
}
-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;
}
}
-// 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)
/* MAIN MENU */
int m_main_cursor;
-//#define MAIN_ITEMS 5
int MAIN_ITEMS = 4; // Nehahra: Menu Disable
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;
+ // 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");
- 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_TRANSFUSION)
+ {
+ if (key == K_ESCAPE || key == K_ENTER)
+ m_state = m_main;
+ return;
+ }
+
switch (key)
{
case K_ESCAPE:
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)
{
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_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));
}
}
- 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;
}
//=============================================================================
//=============================================================================
/* OPTIONS MENU */
-#define OPTIONS_ITEMS 27
-
#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<SLIDER_RANGE ; i++)
+ M_DrawCharacter (x + i*8, y, 129);
+ M_DrawCharacter (x+i*8, y, 130);
+ M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131);
+}
+
+void M_DrawCheckbox (int x, int y, int on)
+{
+ if (on)
+ M_Print (x, y, "on");
+ else
+ M_Print (x, y, "off");
+}
+
+
+#define OPTIONS_ITEMS 27
+
int options_cursor;
void M_Menu_Options_f (void)
}
-void M_AdjustSliders (int dir)
+void M_Menu_Options_AdjustSliders (int dir)
{
S_LocalSound ("misc/menu3.wav");
switch (options_cursor)
{
- case 4:
- Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
- break;
case 5:
- Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
+ Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
break;
case 6:
- Cvar_SetValueQuick (&r_skyquality, bound(0, r_skyquality.integer + dir, 2));
+ Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
break;
case 7:
- Cvar_SetValueQuick (&r_ser, !r_ser.integer);
+ Cvar_SetValueQuick (&r_sky, !r_sky.integer);
break;
case 8:
Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
}
}
-
-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<SLIDER_RANGE ; i++)
- M_DrawCharacter (x + i*8, y, 129);
- M_DrawCharacter (x+i*8, y, 130);
- M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131);
-}
-
-void M_DrawCheckbox (int x, int y, int on)
-{
-#if 0
- if (on)
- M_DrawCharacter (x, y, 131);
- else
- M_DrawCharacter (x, y, 129);
-#endif
- if (on)
- M_Print (x, y, "on");
- else
- M_Print (x, y, "off");
-}
-
-/*
-int m_2dres[] =
-{
- 320, 200,
- 320, 240,
- 400, 300,
- 512, 384,
- 640, 480,
- 800, 600,
- 1024, 768,
- 1280, 960,
- 1600, 1200,
- 2048, 1536
-};
-
-int M_Num2DResolutions(void)
-{
- return sizeof(m_2dres) / sizeof(int[2]);
-};
-
-float M_Classify2DResolution(void)
-{
- int i, num, *res, best, bestdist, diff[3];
- num = M_Num2DResolutions();
- best = -1;
- bestdist = 1000000000;
- for (i = 0;i < num;i++)
- {
- res = m_2dres + i * 2;
- diff[0] = res[0] - vid.conwidth;
- diff[1] = res[1] - vid.conheight;
- diff[2] = 0;
- dist = DotProduct(diff, diff);
- if (bestdist > 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)
{
float y;
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, " 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;
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;
break;
case K_LEFTARROW:
- M_AdjustSliders (-1);
+ M_Menu_Options_AdjustSliders (-1);
break;
case K_RIGHTARROW:
- M_AdjustSliders (1);
+ 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_Menu_Options_Effects_AdjustSliders (1);
break;
}
}
char *bindnames[][2] =
{
+#ifdef TRANSFUSION
+{"+forward", "walk forward"},
+{"+back", "backpedal"},
+{"+moveleft", "step left"},
+{"+moveright", "step right"},
+{"+jump", "jump / swim up"},
+{"+movedown", "swim down"},
+{"+attack", "attack"},
+{"+button3", "altfire"},
+{"impulse 1", "Pitch Fork"},
+{"impulse 2", "Flare Gun"},
+{"impulse 3", "Shotgun"},
+{"impulse 4", "Machine Gun"},
+{"impulse 5", "Incinerator"},
+{"impulse 6", "Bombs"},
+{"impulse 7", "Aerosol Can"},
+{"impulse 8", "Tesla Cannon"},
+{"impulse 9", "Life Leech"},
+{"impulse 17", "Voodoo Doll"},
+{"impulse 11", "previous weapon"},
+{"impulse 10", "next weapon"},
+{"impulse 14", "previous item"},
+{"impulse 15", "next item"},
+{"impulse 13", "use item"},
+{"impulse 100", "add bot (red)"},
+{"impulse 101", "add bot (blue)"},
+{"impulse 102", "kick a bot"},
+{"impulse 50", "voting menu"},
+{"impulse 141", "identify player"},
+{"impulse 16", "next armor type"},
+{"impulse 20", "observer mode"}
+#else // not TRANSFUSION
{"+attack", "attack"},
-{"impulse 10", "change weapon"},
+{"impulse 10", "next weapon"},
+{"impulse 12", "previous weapon"},
{"+jump", "jump / swim up"},
{"+forward", "walk forward"},
{"+back", "backpedal"},
{"+klook", "keyboard look"},
{"+moveup", "swim up"},
{"+movedown", "swim down"}
+#endif // not TRANSFUSION
};
#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;
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++)
continue;
if (!strcmp (b, command) )
{
- twokeys[count] = j;
- count++;
- if (count == 2)
+ keys[count++] = j;
+ if (count == NUMKEYS)
break;
}
}
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");
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
{
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);
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;
int m_quit_prevstate;
qboolean wasInMenus;
-//#ifndef _WIN32
char *quitMessage [] =
{
/* .........1.........2.... */
" 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 ",
" constructive? ",
" ",
};
-//#endif
void M_Menu_Quit_f (void)
{
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
}
//=============================================================================
{"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!"},
- {"bb7", "Midgard"},
- {"bb8", "Fun With Heads"},
-
- {"dm1", "Monolith Building #11"},
- {"dm2", "Power!"},
- {"dm3", "Area 15"},
-
- {"cpbb01", "Crypt of Despair"},
- {"cpbb03", "Unholy Cathedral"},
-
- {"b2a15", "A15"},
- {"barena", "Blood Arena"},
- {"bkeep", "Blood Keep"},
- {"bstar", "Brownstar"},
- {"crypt", "The Crypt"},
-
- {"bb3_2k1", "Bodies Infusion"},
- {"qbb1", "The Confluence"},
- {"qbb2", "Kathartic"},
- {"qbb3", "Caleb's Woodland Retreat"},
- {"qe1m7", "The House of Chthon"}
+// 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"},
+ {"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[] =
+episode_t transfusionepisodes[] =
{
- {"Blood", 0, 7},
- {"Plasma Pack", 7, 3},
- {"Cryptic Passage", 10, 2},
- {"Blood 2", 12, 5},
- {"BloodBath", 17, 5}
+ {"Blood", 0, 10},
+ {"Plasma Pack", 10, 4},
+ {"Cryptic Passage", 14, 4},
+ {"Blood 2", 18, 5},
+ {"Custom", 23, 7}
};
gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
-gamelevels_t bloodbathgame = {"BloodBath", bloodbathlevels, bloodbathepisodes, 5};
+gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 5};
typedef struct
{
{GAME_NEHAHRA, &nehahragame, &nehahragame},
{GAME_FIENDARENA, &sharewarequakegame, ®isteredquakegame},
{GAME_ZYMOTIC, &sharewarequakegame, ®isteredquakegame},
- {GAME_BLOODBATH, &bloodbathgame, &bloodbathgame},
+ {GAME_TRANSFUSION, &transfusiongame, &transfusiongame},
{-1, &sharewarequakegame, ®isteredquakegame} // final fallback
};
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_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 (gamemode == GAME_ROGUE)
}
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;
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
{
break;
case 2:
- if (deathmatch.integer) // changing from deathmatch to coop
+ if (gamemode == GAME_TRANSFUSION)
{
- Cvar_SetValueQuick (&coop, 1);
- Cvar_SetValueQuick (&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_SetValueQuick (&coop, 0);
- Cvar_SetValueQuick (&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;
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);
M_Options_Draw ();
break;
+ case m_options_effects:
+ M_Options_Effects_Draw ();
+ break;
+
case m_keys:
M_Keys_Draw ();
break;
M_Options_Key (key);
return;
+ case m_options_effects:
+ M_Options_Effects_Key (key);
+ return;
+
case m_keys:
M_Keys_Key (key);
return;
if (IPXConfig || TCPIPConfig)
net_hostport = lanConfig_port;
}
+
projects / xonotic / darkplaces.git / blobdiff