*/
#include "quakedef.h"
+#include "cdaudio.h"
#include "image.h"
+#include "progsvm.h"
#include "mprogdefs.h"
char m_return_reason [32];
+void M_Update_Return_Reason(char *s)
+{
+ strlcpy(m_return_reason, s, sizeof(m_return_reason));
+ if (s)
+ Con_Printf("%s\n", s);
+}
+
#define StartingGame (m_multiplayer_cursor == 1)
#define JoiningGame (m_multiplayer_cursor == 0)
break;
case K_ENTER:
- S_LocalSound ("misc/menu2.wav", true);
+ S_LocalSound ("sound/misc/menu2.wav");
m_state = m_none;
key_dest = key_game;
Cbuf_AddText (va ("playdemo %s\n", NehahraDemos[demo_cursor].name));
case K_UPARROW:
case K_LEFTARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
demo_cursor--;
if (demo_cursor < 0)
demo_cursor = NumberOfNehahraDemos-1;
case K_DOWNARROW:
case K_RIGHTARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
demo_cursor++;
if (demo_cursor >= NumberOfNehahraDemos)
demo_cursor = 0;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
if (++m_main_cursor >= MAIN_ITEMS)
m_main_cursor = 0;
break;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
if (--m_main_cursor < 0)
m_main_cursor = MAIN_ITEMS - 1;
break;
M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/ttl_sgl.lmp");
- // Transfusion doesn't have a single player mode
- if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
+ // Some mods don't have a single player mode
+ if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
{
M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl.lmp");
M_Print(95, 10 * 8, "Nexuiz is for");
else if (gamemode == GAME_GOODVSBAD2)
M_Print(95, 10 * 8, "Good Vs Bad 2 is for");
- else if (gamemode == GAME_BATTLEMECH)
+ else // if (gamemode == GAME_BATTLEMECH)
M_Print(95, 10 * 8, "Battlemech is for");
- else
- M_Print(95, 10 * 8, "Transfusion is for");
M_Print(83, 11 * 8, "multiplayer play only");
}
else
void M_SinglePlayer_Key (int key, char ascii)
{
- if (gamemode == GAME_TRANSFUSION || gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
+ if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
{
if (key == K_ESCAPE || key == K_ENTER)
m_state = m_main;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
if (++m_singleplayer_cursor >= SINGLEPLAYER_ITEMS)
m_singleplayer_cursor = 0;
break;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
if (--m_singleplayer_cursor < 0)
m_singleplayer_cursor = SINGLEPLAYER_ITEMS - 1;
break;
Cbuf_AddText ("coop 0\n");
if (gamemode == GAME_NEHAHRA)
Cbuf_AddText ("map nehstart\n");
+ else if (gamemode == GAME_TRANSFUSION)
+ Cbuf_AddText ("map e1m1\n");
else
Cbuf_AddText ("map start\n");
break;
break;
case K_ENTER:
- S_LocalSound ("misc/menu2.wav", true);
+ S_LocalSound ("sound/misc/menu2.wav");
if (!loadable[load_cursor])
return;
m_state = m_none;
case K_UPARROW:
case K_LEFTARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
load_cursor--;
if (load_cursor < 0)
load_cursor = MAX_SAVEGAMES-1;
case K_DOWNARROW:
case K_RIGHTARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
load_cursor++;
if (load_cursor >= MAX_SAVEGAMES)
load_cursor = 0;
case K_UPARROW:
case K_LEFTARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
load_cursor--;
if (load_cursor < 0)
load_cursor = MAX_SAVEGAMES-1;
case K_DOWNARROW:
case K_RIGHTARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
load_cursor++;
if (load_cursor >= MAX_SAVEGAMES)
load_cursor = 0;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
if (++m_multiplayer_cursor >= MULTIPLAYER_ITEMS)
m_multiplayer_cursor = 0;
break;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
if (--m_multiplayer_cursor < 0)
m_multiplayer_cursor = MULTIPLAYER_ITEMS - 1;
break;
break;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
setup_cursor--;
if (setup_cursor < 0)
setup_cursor = NUM_SETUP_CMDS-1;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
setup_cursor++;
if (setup_cursor >= NUM_SETUP_CMDS)
setup_cursor = 0;
case K_LEFTARROW:
if (setup_cursor < 1)
return;
- S_LocalSound ("misc/menu3.wav", true);
+ S_LocalSound ("sound/misc/menu3.wav");
if (setup_cursor == 1)
setup_top = setup_top - 1;
if (setup_cursor == 2)
if (setup_cursor < 1)
return;
forward:
- S_LocalSound ("misc/menu3.wav", true);
+ S_LocalSound ("sound/misc/menu3.wav");
if (setup_cursor == 1)
setup_top = setup_top + 1;
if (setup_cursor == 2)
m_entersound = true;
}
-extern cvar_t snd_staticvolume;
extern cvar_t slowmo;
extern dllhandle_t jpeg_dll;
extern cvar_t gl_texture_anisotropy;
void M_Menu_Options_AdjustSliders (int dir)
{
int optnum;
- S_LocalSound ("misc/menu3.wav", true);
+ S_LocalSound ("sound/misc/menu3.wav");
optnum = 7;
if (options_cursor == optnum++)
return;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
options_cursor--;
if (options_cursor < 0)
options_cursor = OPTIONS_ITEMS-1;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
options_cursor++;
if (options_cursor >= OPTIONS_ITEMS)
options_cursor = 0;
}
}
-#define OPTIONS_EFFECTS_ITEMS 34
+#define OPTIONS_EFFECTS_ITEMS 37
int options_effects_cursor;
extern cvar_t r_detailtextures;
-extern cvar_t cl_particles;
extern cvar_t cl_stainmaps;
extern cvar_t cl_stainmapsclearonload;
-extern cvar_t cl_decals;
extern cvar_t r_explosionclip;
extern cvar_t r_modellights;
extern cvar_t r_coronas;
extern cvar_t gl_flashblend;
-extern cvar_t cl_particles_quality;
-extern cvar_t cl_particles_bulletimpacts;
-extern cvar_t cl_particles_smoke;
-extern cvar_t cl_particles_sparks;
-extern cvar_t cl_particles_bubbles;
-extern cvar_t cl_particles_blood;
-extern cvar_t cl_particles_blood_alpha;
-extern cvar_t cl_particles_blood_bloodhack;
-extern cvar_t cl_particles_explosions_shell;
+extern cvar_t cl_beams_polygon;
+extern cvar_t cl_beams_relative;
+extern cvar_t cl_beams_lightatend;
extern cvar_t r_lightningbeam_thickness;
extern cvar_t r_lightningbeam_scroll;
extern cvar_t r_lightningbeam_repeatdistance;
void M_Menu_Options_Effects_AdjustSliders (int dir)
{
int optnum;
- S_LocalSound ("misc/menu3.wav", true);
+ S_LocalSound ("sound/misc/menu3.wav");
optnum = 0;
if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_polygons, !cl_beams_polygons.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_relative, !cl_beams_relative.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_lightatend, !cl_beams_lightatend.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_thickness, bound(1, r_lightningbeam_thickness.integer + dir, 10));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_scroll, bound(0, r_lightningbeam_scroll.integer + dir, 10));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_repeatdistance, bound(64, r_lightningbeam_repeatdistance.integer + dir * 64, 1024));
M_Options_PrintCheckbox(" Blood", true, cl_particles_blood.integer);
M_Options_PrintSlider( " Blood Opacity", true, cl_particles_blood_alpha.value, 0.2, 1);
M_Options_PrintCheckbox("Force New Blood Effect", true, cl_particles_blood_bloodhack.integer);
- M_Options_PrintSlider( " Lightning Thickness", true, r_lightningbeam_thickness.integer, 1, 10);
- M_Options_PrintSlider( " Lightning Scroll", true, r_lightningbeam_scroll.integer, 0, 10);
- M_Options_PrintSlider( " Lightning Repeat Dist", true, r_lightningbeam_repeatdistance.integer, 64, 1024);
- M_Options_PrintSlider( " Lightning Color Red", true, r_lightningbeam_color_red.value, 0, 1);
- M_Options_PrintSlider( " Lightning Color Green", true, r_lightningbeam_color_green.value, 0, 1);
- M_Options_PrintSlider( " Lightning Color Blue", true, r_lightningbeam_color_blue.value, 0, 1);
- M_Options_PrintCheckbox(" Lightning QMB Texture", true, r_lightningbeam_qmbtexture.integer);
+ M_Options_PrintCheckbox(" Lightning Polygons", true, cl_beams_polygons.integer);
+ M_Options_PrintCheckbox("Lightning Smooth Sweep", true, cl_beams_relative.integer);
+ M_Options_PrintCheckbox(" Lightning End Light", true, cl_beams_lightatend.integer);
+ M_Options_PrintSlider( " Lightning Thickness", cl_beams_polygons.integer, r_lightningbeam_thickness.integer, 1, 10);
+ M_Options_PrintSlider( " Lightning Scroll", cl_beams_polygons.integer, r_lightningbeam_scroll.integer, 0, 10);
+ M_Options_PrintSlider( " Lightning Repeat Dist", cl_beams_polygons.integer, r_lightningbeam_repeatdistance.integer, 64, 1024);
+ M_Options_PrintSlider( " Lightning Color Red", cl_beams_polygons.integer, r_lightningbeam_color_red.value, 0, 1);
+ M_Options_PrintSlider( " Lightning Color Green", cl_beams_polygons.integer, r_lightningbeam_color_green.value, 0, 1);
+ M_Options_PrintSlider( " Lightning Color Blue", cl_beams_polygons.integer, r_lightningbeam_color_blue.value, 0, 1);
+ M_Options_PrintCheckbox(" Lightning QMB Texture", cl_beams_polygons.integer, r_lightningbeam_qmbtexture.integer);
M_Options_PrintCheckbox(" Model Interpolation", true, r_lerpmodels.integer);
M_Options_PrintCheckbox(" Sprite Interpolation", true, r_lerpsprites.integer);
M_Options_PrintSlider( " View Blend", true, gl_polyblend.value, 0, 1);
break;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/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", true);
+ S_LocalSound ("sound/misc/menu1.wav");
options_effects_cursor++;
if (options_effects_cursor >= OPTIONS_EFFECTS_ITEMS)
options_effects_cursor = 0;
void M_Menu_Options_Graphics_AdjustSliders (int dir)
{
int optnum;
- S_LocalSound ("misc/menu3.wav", true);
+ S_LocalSound ("sound/misc/menu3.wav");
optnum = 0;
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight_shadows, !r_shadow_realtime_dlight_shadows.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world, !r_shadow_realtime_world.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_dlightshadows, !r_shadow_realtime_world_dlightshadows.integer);
- else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps, !r_shadow_realtime_world_lightmaps.integer);
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps, bound(0, r_shadow_realtime_world_lightmaps.value + dir * 0.1, 1));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_shadows, !r_shadow_realtime_world_shadows.integer);
}
M_Options_PrintCheckbox(" RT DLight Shadows", true, r_shadow_realtime_dlight_shadows.integer);
M_Options_PrintCheckbox(" RT World", true, r_shadow_realtime_world.integer);
M_Options_PrintCheckbox("RT World DLight Shadows", true, r_shadow_realtime_world_dlightshadows.integer);
- M_Options_PrintCheckbox(" RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.integer);
+ M_Options_PrintSlider( " RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1);
M_Options_PrintCheckbox(" RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
}
break;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
options_graphics_cursor--;
if (options_graphics_cursor < 0)
options_graphics_cursor = OPTIONS_GRAPHICS_ITEMS-1;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
options_graphics_cursor++;
if (options_graphics_cursor >= OPTIONS_GRAPHICS_ITEMS)
options_graphics_cursor = 0;
{
int optnum;
float f;
- S_LocalSound ("misc/menu3.wav", true);
+ S_LocalSound ("sound/misc/menu3.wav");
optnum = 1;
if (options_colorcontrol_cursor == optnum++)
return;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
options_colorcontrol_cursor--;
if (options_colorcontrol_cursor < 0)
options_colorcontrol_cursor = OPTIONS_COLORCONTROL_ITEMS-1;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
options_colorcontrol_cursor++;
if (options_colorcontrol_cursor >= OPTIONS_COLORCONTROL_ITEMS)
options_colorcontrol_cursor = 0;
if (bind_grab)
{ // defining a key
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
if (k == K_ESCAPE)
{
bind_grab = false;
case K_LEFTARROW:
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
do
{
keys_cursor--;
case K_DOWNARROW:
case K_RIGHTARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
do
{
keys_cursor++;
case K_ENTER: // go into bind mode
M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
- S_LocalSound ("misc/menu2.wav", true);
+ S_LocalSound ("sound/misc/menu2.wav");
if (keys[NUMKEYS - 1] != -1)
M_UnbindCommand (bindnames[keys_cursor][0]);
bind_grab = true;
case K_BACKSPACE: // delete bindings
case K_DEL: // delete bindings
- S_LocalSound ("misc/menu2.wav", true);
+ S_LocalSound ("sound/misc/menu2.wav");
M_UnbindCommand (bindnames[keys_cursor][0]);
break;
}
M_Print(220, video_cursor_table[3], "Apply");
// Vertical Sync
- M_Print(16, video_cursor_table[4], " Vertical Sync");
+ M_ItemPrint (0, video_cursor_table[4], " Vertical Sync", gl_videosyncavailable);
M_DrawCheckbox(220, video_cursor_table[4], vid_vsync.integer);
// Cursor
void M_Menu_Video_AdjustSliders (int dir)
{
- S_LocalSound ("misc/menu3.wav", true);
+ S_LocalSound ("sound/misc/menu3.wav");
switch (video_cursor)
{
Cvar_SetValueQuick(&vid_height, current_vid_height);
Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel);
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
M_Menu_Options_f ();
break;
break;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
video_cursor--;
if (video_cursor < 0)
video_cursor = VIDEO_ITEMS-1;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
video_cursor++;
if (video_cursor >= VIDEO_ITEMS)
video_cursor = 0;
lanConfig_port = 26000;
sprintf(lanConfig_portname, "%u", lanConfig_port);
- m_return_reason[0] = 0;
+ M_Update_Return_Reason("");
}
break;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
lanConfig_cursor--;
if (lanConfig_cursor < 0)
lanConfig_cursor = NUM_LANCONFIG_CMDS-1;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
lanConfig_cursor++;
if (lanConfig_cursor >= NUM_LANCONFIG_CMDS)
lanConfig_cursor = 0;
// Map list for Transfusion
level_t transfusionlevels[] =
{
- {"bb1", "The Stronghold"},
- {"bb2", "Winter Wonderland"},
- {"bb3", "Bodies"},
- {"bb4", "The Tower"},
- {"bb5", "Click!"},
- {"bb6", "Twin Fortress"},
- {"bb7", "Midgard"},
- {"bb8", "Fun With Heads"},
-
{"e1m1", "Cradle to Grave"},
{"e1m2", "Wrong Side of the Tracks"},
+ {"e1m3", "Phantom Express"},
+ {"e1m4", "Dark Carnival"},
+ {"e1m5", "Hallowed Grounds"},
+ {"e1m6", "The Great Temple"},
{"e1m7", "Altar of Stone"},
+ {"e1m8", "House of Horrors"},
+
+ {"e2m1", "Shipwrecked"},
+ {"e2m2", "The Lumber Mill"},
+ {"e2m3", "Rest for the Wicked"},
+ {"e2m4", "The Overlooked Hotel"},
+ {"e2m5", "The Haunting"},
+ {"e2m6", "The Cold Rush"},
+ {"e2m7", "Bowels of the Earth"},
{"e2m8", "The Lair of Shial"},
+ {"e2m9", "Thin Ice"},
+
{"e3m1", "Ghost Town"},
+ {"e3m2", "The Siege"},
+ {"e3m3", "Raw Sewage"},
+ {"e3m4", "The Sick Ward"},
+ {"e3m5", "Spare Parts"},
+ {"e3m6", "Monster Bait"},
{"e3m7", "The Pit of Cerberus"},
+ {"e3m8", "Catacombs"},
+
{"e4m1", "Butchery Loves Company"},
+ {"e4m2", "Breeding Grounds"},
+ {"e4m3", "Charnel House"},
+ {"e4m4", "Crystal Lake"},
+ {"e4m5", "Fire and Brimstone"},
+ {"e4m6", "The Ganglion Depths"},
{"e4m7", "In the Flesh"},
{"e4m8", "The Hall of the Epiphany"},
{"e4m9", "Mall of the Dead"},
+ {"bb1", "The Stronghold"},
+ {"bb2", "Winter Wonderland"},
+ {"bb3", "Bodies"},
+ {"bb4", "The Tower"},
+ {"bb5", "Click!"},
+ {"bb6", "Twin Fortress"},
+ {"bb7", "Midgard"},
+ {"bb8", "Fun With Heads"},
{"dm1", "Monolith Building 11"},
{"dm2", "Power!"},
{"dm3", "Area 15"},
+
{"e6m1", "Welcome to Your Life"},
+ {"e6m2", "They Are Here"},
+ {"e6m3", "Public Storage"},
+ {"e6m4", "Aqueducts"},
+ {"e6m5", "The Ruined Temple"},
+ {"e6m6", "Forbidden Rituals"},
+ {"e6m7", "The Dungeon"},
{"e6m8", "Beauty and the Beast"},
{"e6m9", "Forgotten Catacombs"},
+ {"cp01", "Boat Docks"},
+ {"cp02", "Old Opera House"},
+ {"cp03", "Gothic Library"},
+ {"cp04", "Lost Monastery"},
+ {"cp05", "Steamboat"},
+ {"cp06", "Graveyard"},
+ {"cp07", "Mountain Pass"},
+ {"cp08", "Abysmal Mine"},
+ {"cp09", "Castle"},
+ {"cps1", "Boggy Creek"},
+
{"cpbb01", "Crypt of Despair"},
+ {"cpbb02", "Pits of Blood"},
{"cpbb03", "Unholy Cathedral"},
+ {"cpbb04", "Deadly Inspirations"},
{"b2a15", "Area 15 (B2)"},
{"barena", "Blood Arena"},
episode_t transfusionepisodes[] =
{
- {"Blood", 0, 8},
- {"Blood Single Player", 8, 10},
- {"Plasma Pack", 18, 6},
- {"Cryptic Passage", 24, 2},
- {"Blood 2", 26, 5},
- {"Transfusion", 31, 9},
- {"Conversions", 40, 6}
+ {"The Way of All Flesh", 0, 8},
+ {"Even Death May Die", 8, 9},
+ {"Farewell to Arms", 17, 8},
+ {"Dead Reckoning", 25, 9},
+ {"BloodBath", 34, 11},
+ {"Post Mortem", 45, 9},
+ {"Cryptic Passage", 54, 10},
+ {"Cryptic BloodBath", 64, 4},
+ {"Blood 2", 68, 5},
+ {"Transfusion", 73, 9},
+ {"Conversions", 82, 6}
};
level_t goodvsbad2levels[] =
gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
-gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 7};
+gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 11};
gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
M_Print(0, 64, " Game Type");
if (gamemode == GAME_TRANSFUSION)
{
- if (!deathmatch.integer)
+ if (!coop.integer && !deathmatch.integer)
Cvar_SetValue("deathmatch", 1);
- if (deathmatch.integer == 2)
+ if (deathmatch.integer == 0)
+ M_Print(160, 64, "Cooperative");
+ else if (deathmatch.integer == 2)
M_Print(160, 64, "Capture the Flag");
else
M_Print(160, 64, "Blood Bath");
break;
if (gamemode == GAME_TRANSFUSION)
{
- if (deathmatch.integer == 2) // changing from CTF to BloodBath
- Cvar_SetValueQuick (&deathmatch, 0);
- else // changing from BloodBath to CTF
- Cvar_SetValueQuick (&deathmatch, 2);
+ switch (deathmatch.integer)
+ {
+ // From Cooperative to BloodBath
+ case 0:
+ Cvar_SetValueQuick (&coop, 0);
+ Cvar_SetValueQuick (&deathmatch, 1);
+ break;
+
+ // From BloodBath to CTF
+ case 1:
+ Cvar_SetValueQuick (&coop, 0);
+ Cvar_SetValueQuick (&deathmatch, 2);
+ break;
+
+ // From CTF to Cooperative
+ //case 2:
+ default:
+ Cvar_SetValueQuick (&coop, 1);
+ Cvar_SetValueQuick (&deathmatch, 0);
+ }
}
else if (gamemode == GAME_BATTLEMECH)
{
break;
case K_UPARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
gameoptions_cursor--;
if (gameoptions_cursor < 0)
gameoptions_cursor = NUM_GAMEOPTIONS-1;
break;
case K_DOWNARROW:
- S_LocalSound ("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
gameoptions_cursor++;
if (gameoptions_cursor >= NUM_GAMEOPTIONS)
gameoptions_cursor = 0;
case K_LEFTARROW:
if (gameoptions_cursor == 0)
break;
- S_LocalSound ("misc/menu3.wav", true);
+ S_LocalSound ("sound/misc/menu3.wav");
M_NetStart_Change (-1);
break;
case K_RIGHTARROW:
if (gameoptions_cursor == 0)
break;
- S_LocalSound ("misc/menu3.wav", true);
+ S_LocalSound ("sound/misc/menu3.wav");
M_NetStart_Change (1);
break;
case K_ENTER:
- S_LocalSound ("misc/menu2.wav", true);
+ S_LocalSound ("sound/misc/menu2.wav");
if (gameoptions_cursor == 0)
{
if (sv.active)
m_state = m_slist;
m_entersound = true;
slist_cursor = 0;
- m_return_reason[0] = 0;
+ M_Update_Return_Reason("");
Net_Slist_f();
}
case K_UPARROW:
case K_LEFTARROW:
- S_LocalSound("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
slist_cursor--;
if (slist_cursor < 0)
slist_cursor = hostCacheCount - 1;
case K_DOWNARROW:
case K_RIGHTARROW:
- S_LocalSound("misc/menu1.wav", true);
+ S_LocalSound ("sound/misc/menu1.wav");
slist_cursor++;
if (slist_cursor >= hostCacheCount)
slist_cursor = 0;
break;
case K_ENTER:
- S_LocalSound("misc/menu2.wav", true);
+ S_LocalSound ("sound/misc/menu2.wav");
Cbuf_AddText(va("connect \"%s\"\n", hostcache[slist_cursor].cname));
break;
if (m_entersound)
{
- S_LocalSound ("misc/menu2.wav", true);
+ S_LocalSound ("sound/misc/menu2.wav");
m_entersound = false;
}
#define M_F_INIT "m_init"
#define M_F_KEYDOWN "m_keydown"
#define M_F_DRAW "m_draw"
-// ng_menu function names
-#define M_F_DISPLAY "m_display"
-#define M_F_HIDE "m_hide"
// normal menu names (rest)
#define M_F_TOGGLE "m_toggle"
#define M_F_SHUTDOWN "m_shutdown"
M_F_INIT,
M_F_KEYDOWN,
M_F_DRAW,
-#ifdef NG_MENU
-M_F_DISPLAY,
-M_F_HIDE,
-#else
M_F_TOGGLE,
-#endif
M_F_SHUTDOWN,
};
void MP_Restart(void)
{
-
MP_Init();
}
void MR_Init(void)
{
// use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1)
+// COMMANDLINEOPTION: Client: -forceqmenu disables menu.dat (same as +forceqmenu 1)
if(COM_CheckParm("-forceqmenu"))
Cvar_SetValueQuick(&forceqmenu,1);
// use -useqmenu for debugging proposes, cause it starts
// the normal quake menu only the first time
+// COMMANDLINEOPTION: Client: -useqmenu causes the first time you open the menu to use the quake menu, then reverts to menu.dat (if forceqmenu is 0)
if(COM_CheckParm("-useqmenu"))
MR_SetRouting (TRUE);
else
projects / xonotic / darkplaces.git / blobdiff