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);
}
-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;
//=============================================================================
-int m_save_demonum;
+//int m_save_demonum;
/*
================
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 ();
- }
}
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;
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:
M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/ttl_sgl.lmp");
- // BloodBath doesn't have a single player mode
- if (gamemode == GAME_BLOODBATH)
+ // 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 (102, 10 * 8, "BloodBath is for");
+ M_PrintWhite (95, 10 * 8, "Transfusion is for");
M_PrintWhite (83, 11 * 8, "multiplayer play only");
}
else
void M_SinglePlayer_Key (int key)
{
- if (gamemode == GAME_BLOODBATH)
+ if (gamemode == GAME_TRANSFUSION)
{
if (key == K_ESCAPE || key == K_ENTER)
m_state = m_main;
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 28
+
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));
case 18:
Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
break;
- case 19: // show framerate
+ case 19: // static crosshair
+ Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer);
+ break;
+ case 20: // show framerate
Cvar_SetValueQuick (&showfps, !showfps.integer);
break;
- case 20: // always run
+ case 21: // always run
if (cl_forwardspeed.value > 200)
{
Cvar_SetValueQuick (&cl_forwardspeed, 200);
Cvar_SetValueQuick (&cl_backspeed, 400);
}
break;
- case 21: // lookspring
+ case 22: // lookspring
Cvar_SetValueQuick (&lookspring, !lookspring.integer);
break;
- case 22: // lookstrafe
+ case 23: // lookstrafe
Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
break;
- case 23: // mouse speed
+ case 24: // mouse speed
Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
break;
- case 24: // mouse look
+ case 25: // mouse look
Cvar_SetValueQuick (&freelook, !freelook.integer);
break;
- case 25: // invert mouse
+ case 26: // invert mouse
Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
break;
- case 26: // windowed mouse
+ 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 ; 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");
-}
-
-
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;
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.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_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;
}
}
//=============================================================================
/* KEYS MENU */
-char *bindnames[][2] =
+char *quakebindnames[][2] =
{
{"+attack", "attack"},
{"impulse 10", "next weapon"},
{"+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
M_Print (18, 32, "Enter to change, backspace to clear");
// search for known bindings
- for (i=0 ; i<NUMCOMMANDS ; i++)
+ for (i=0 ; i<numcommands ; i++)
{
y = 48 + 8*i;
}
}
}
- M_Print (140, y, keystring);
+ 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));
}
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 'Y':
case 'y':
- key_dest = key_console;
Host_Quit_f ();
break;
{"Dimension of the Lost", 17, 2}
};
-// Map list for BloodBath
-level_t bloodbathlevels[] =
+// Map list for Transfusion
+level_t transfusionlevels[] =
{
{"bb1", "The Stronghold"},
{"bb2", "Winter Wonderland"},
{"e6m8", "Beauty and the Beast"},
{"cpbb01", "Crypt of Despair"},
- {"cpbb02", "Pits of Blood"},
{"cpbb03", "Unholy Cathedral"},
- {"cpbb04", "Deadly Inspirations"},
{"b2a15", "Area 15 (B2)"},
{"barena", "Blood Arena"},
{"crypt", "The Crypt"},
{"bb3_2k1", "Bodies Infusion"},
+ {"dranzbb6", "Black Coffee"},
{"qbb1", "The Confluence"},
{"qbb2", "KathartiK"},
{"qbb3", "Caleb's Woodland Retreat"},
- {"ded_simp", "Dead Simple"},
- {"dranzbb6", "Black Coffee"},
- {"qe1m7", "The House of Chthon"}
+ {"qe1m7", "The House of Chthon"},
+ {"simple", "Dead Simple"}
};
-episode_t bloodbathepisodes[] =
+episode_t transfusionepisodes[] =
{
{"Blood", 0, 10},
{"Plasma Pack", 10, 4},
- {"Cryptic Passage", 14, 4},
- {"Blood 2", 18, 5},
- {"BloodBath", 23, 7}
+ {"Cryptic Passage", 14, 2},
+ {"Blood 2", 16, 5},
+ {"Custom", 21, 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_HIPNOTIC, &hipnoticgame, &hipnoticgame},
{GAME_ROGUE, &roguegame, &roguegame},
{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
};
if (maxplayers == 0)
maxplayers = svs.maxclients;
if (maxplayers < 2)
- maxplayers = svs.maxclientslimit;
+ maxplayers = MAX_SCOREBOARD;
}
M_Print (160, 56, va("%i", maxplayers) );
M_Print (0, 64, " Game Type");
- if (gamemode == GAME_BLOODBATH)
+ if (gamemode == GAME_TRANSFUSION)
{
if (!deathmatch.integer)
Cvar_SetValue("deathmatch", 1);
}
M_Print (160, 72, msg);
}
- else if (gamemode == GAME_BLOODBATH)
+ else if (gamemode == GAME_TRANSFUSION)
{
char *msg;
{
case 1:
maxplayers += dir;
- if (maxplayers > svs.maxclientslimit)
+ if (maxplayers > MAX_SCOREBOARD)
{
- maxplayers = svs.maxclientslimit;
+ maxplayers = MAX_SCOREBOARD;
m_serverInfoMessage = true;
m_serverInfoMessageTime = realtime;
}
break;
case 2:
- if (gamemode == GAME_BLOODBATH)
+ if (gamemode == GAME_TRANSFUSION)
{
if (deathmatch.integer == 2) // changing from CTF to BloodBath
Cvar_SetValueQuick (&deathmatch, 0);
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 (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"))
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;
projects / xonotic / darkplaces.git / blobdiff