*/
#include "quakedef.h"
-#ifdef _WIN32
-#include "winquake.h"
-#endif
-
void (*vid_menudrawfn)(void);
void (*vid_menukeyfn)(int key);
void M_Menu_LanConfig_f (void);
void M_Menu_GameOptions_f (void);
void M_Menu_Search_f (void);
+void M_Menu_InetSearch_f (void);
void M_Menu_ServerList_f (void);
void M_Main_Draw (void);
void M_LanConfig_Draw (void);
void M_GameOptions_Draw (void);
void M_Search_Draw (void);
+void M_InetSearch_Draw (void);
void M_ServerList_Draw (void);
void M_Main_Key (int key);
void M_LanConfig_Key (int key);
void M_GameOptions_Key (int key);
void M_Search_Key (int key);
+void M_InetSearch_Key (int key);
void M_ServerList_Key (int key);
qboolean m_entersound; // play after drawing a frame, so caching
//=============================================================================
-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;
if (ipxAvailable || tcpipAvailable)
return;
- M_PrintWhite ((320/2) - ((27*8)/2), 148, "No Communications Available");
+ M_PrintWhite ((320/2) - ((27*8)/2), 168, "No Communications Available");
}
}
// LordHavoc: rewrote this code greatly
-void M_MenuPlayerTranslate (qbyte *translation)
+void M_MenuPlayerTranslate (qbyte *translation, int top, int bottom)
{
- int i, c;
+ int i;
unsigned int trans[4096];
- qpic_t *p;
+ qbyte *data, *f;
+ static qbyte pixels[4096];
+ static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load = true, menuplyr_failed = false;
- p = W_GetLumpName ("gfx/menuplyr.lmp");
- if (!p)
+ if (menuplyr_failed)
return;
- c = p->width * p->height;
- if (c > 4096)
- {
- Con_Printf("M_MenuPlayerTranslate: image larger than 4096 pixel buffer\n");
+ 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);
}
- for (i = 0;i < c;i++)
- trans[i] = d_8to24table[translation[((qbyte *)p->data)[i]]];
+ 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", p->width, p->height, true, (qbyte *)trans);
+ Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)trans);
}
void M_Setup_Draw (void)
M_DrawPic (160, 64, "gfx/bigbox.lmp");
// LordHavoc: rewrote this code greatly
- M_BuildTranslationTable (setup_top*16, setup_bottom*16);
- M_MenuPlayerTranslate (translationTable);
+ 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;
}
//=============================================================================
}
-#define OPTIONS_ITEMS 27
+#define OPTIONS_ITEMS 28
int options_cursor;
Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
break;
case 7:
- Cvar_SetValueQuick (&r_skyquality, bound(0, r_skyquality.integer + dir, 2));
+ 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;
}
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, " 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;
}
}
-#define OPTIONS_EFFECTS_ITEMS 11
+#define OPTIONS_EFFECTS_ITEMS 16
int options_effects_cursor;
}
+extern cvar_t r_detailtextures;
extern cvar_t cl_particles;
extern cvar_t cl_explosions;
extern cvar_t cl_stainmaps;
-extern cvar_t r_lightmodels;
+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;
switch (options_effects_cursor)
{
case 0:
- Cvar_SetValueQuick (&r_lightmodels, !r_lightmodels.integer);
+ Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
break;
case 1:
- Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
+ Cvar_SetValueQuick (&r_dlightmap, !r_dlightmap.integer);
break;
case 2:
- Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
+ Cvar_SetValueQuick (&r_coronas, !r_coronas.integer);
break;
case 3:
- Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
+ Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
break;
case 4:
- Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
+ Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
break;
case 5:
- Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
+ Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
break;
case 6:
- Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
+ Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
break;
case 7:
- Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
+ Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
break;
case 8:
- Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
+ Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
break;
case 9:
- Cvar_SetValueQuick (&cl_particles_blood_size, bound(2, cl_particles_blood_size.value + dir * 1, 20));
+ 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;
}
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
y = 32;
- M_Print(16, y, " Model Lighting");M_DrawCheckbox(220, y, r_lightmodels.integer);y += 8;
+ 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;
//=============================================================================
/* KEYS MENU */
-char *bindnames[][2] =
+char *quakebindnames[][2] =
+{
+{"+attack", "attack"},
+{"impulse 10", "next weapon"},
+{"impulse 12", "previous weapon"},
+{"+jump", "jump / swim up"},
+{"+forward", "walk forward"},
+{"+back", "backpedal"},
+{"+left", "turn left"},
+{"+right", "turn right"},
+{"+speed", "run"},
+{"+moveleft", "step left"},
+{"+moveright", "step right"},
+{"+strafe", "sidestep"},
+{"+lookup", "look up"},
+{"+lookdown", "look down"},
+{"centerview", "center view"},
+{"+mlook", "mouse look"},
+{"+klook", "keyboard look"},
+{"+moveup", "swim up"},
+{"+movedown", "swim down"}
+};
+
+char *transfusionbindnames[][2] =
{
-#ifdef BLOODBATH
{"+forward", "walk forward"},
{"+back", "backpedal"},
{"+moveleft", "step left"},
{"impulse 141", "identify player"},
{"impulse 16", "next armor type"},
{"impulse 20", "observer mode"}
-#else // not BLOODBATH
-{"+attack", "attack"},
-{"impulse 10", "next weapon"},
-{"impulse 12", "previous weapon"},
-{"+jump", "jump / swim up"},
-{"+forward", "walk forward"},
-{"+back", "backpedal"},
-{"+left", "turn left"},
-{"+right", "turn right"},
-{"+speed", "run"},
-{"+moveleft", "step left"},
-{"+moveright", "step right"},
-{"+strafe", "sidestep"},
-{"+lookup", "look up"},
-{"+lookdown", "look down"},
-{"centerview", "center view"},
-{"+mlook", "mouse look"},
-{"+klook", "keyboard look"},
-{"+moveup", "swim up"},
-{"+movedown", "swim down"}
-#endif // not BLOODBATH
};
-#define NUMCOMMANDS (sizeof(bindnames)/sizeof(bindnames[0]))
+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;
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;
/* LAN CONFIG MENU */
int lanConfig_cursor = -1;
-int lanConfig_cursor_table [] = {72, 92, 124};
-#define NUM_LANCONFIG_CMDS 3
+int lanConfig_cursor_table [] = {72, 92, 112, 144};
+#define NUM_LANCONFIG_CMDS 4
int lanConfig_port;
char lanConfig_portname[6];
if (JoiningGame)
{
M_Print (basex, lanConfig_cursor_table[1], "Search for local games...");
- M_Print (basex, 108, "Join game at:");
- M_DrawTextBox (basex+8, lanConfig_cursor_table[2]-8, 22, 1);
- M_Print (basex+16, lanConfig_cursor_table[2], lanConfig_joinname);
+ M_Print (basex, lanConfig_cursor_table[2], "Search for internet games...");
+ M_Print (basex, 128, "Join game at:");
+ M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, 22, 1);
+ M_Print (basex+16, lanConfig_cursor_table[3], lanConfig_joinname);
}
else
{
if (lanConfig_cursor == 0)
M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [0], 10+((int)(realtime*4)&1));
- if (lanConfig_cursor == 2)
- M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [2], 10+((int)(realtime*4)&1));
+ if (lanConfig_cursor == 3)
+ M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [3], 10+((int)(realtime*4)&1));
if (*m_return_reason)
- M_PrintWhite (basex, 148, m_return_reason);
+ M_PrintWhite (basex, 168, m_return_reason);
}
M_ConfigureNetSubsystem ();
- if (lanConfig_cursor == 1)
+ if (lanConfig_cursor == 1 || lanConfig_cursor == 2)
{
if (StartingGame)
{
M_Menu_GameOptions_f ();
break;
}
- M_Menu_Search_f();
+ if (lanConfig_cursor == 1)
+ M_Menu_Search_f();
+ else
+ M_Menu_InetSearch_f();
break;
}
- if (lanConfig_cursor == 2)
+ if (lanConfig_cursor == 3)
{
m_return_state = m_state;
m_return_onerror = true;
lanConfig_portname[strlen(lanConfig_portname)-1] = 0;
}
- if (lanConfig_cursor == 2)
+ if (lanConfig_cursor == 3)
{
if (strlen(lanConfig_joinname))
lanConfig_joinname[strlen(lanConfig_joinname)-1] = 0;
if (key < 32 || key > 127)
break;
- if (lanConfig_cursor == 2)
+ if (lanConfig_cursor == 3)
{
l = strlen(lanConfig_joinname);
if (l < 21)
}
}
- if (StartingGame && lanConfig_cursor == 2)
+ if (StartingGame && lanConfig_cursor == 3)
{
if (key == K_UPARROW)
lanConfig_cursor = 1;
{"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"},
{"bb6", "Twin Fortress"},
{"bb7", "Midgard"},
{"bb8", "Fun With Heads"},
+
{"e1m1", "Cradle to Grave"},
+ {"e1m2", "Wrong Side of the Tracks"},
{"e1m7", "Altar of Stone"},
{"dm1", "Monolith Building 11"},
{"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"},
+ {"dcamp", "DeathCamp"},
+ {"dranzbb6", "Black Coffee"},
+ {"highnoon", "HighNoon"},
{"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}
+ {"Blood", 0, 8},
+ {"Blood Single Player", 8, 3},
+ {"Plasma Pack", 11, 4},
+ {"Cryptic Passage", 15, 2},
+ {"Blood 2", 17, 5},
+ {"Custom", 22, 9}
};
gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
gamelevels_t 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, 6};
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);
{
}
+//=============================================================================
+/* INTERNET SEARCH MENU */
+
+void M_Menu_InetSearch_f (void)
+{
+ key_dest = key_menu;
+ m_state = m_search;
+ m_entersound = false;
+ slistSilent = true;
+ slistLocal = false;
+ searchComplete = false;
+ NET_InetSlist_f();
+
+}
+
+
+void M_InetSearch_Draw (void)
+{
+ cachepic_t *p;
+ int x;
+
+ p = Draw_CachePic ("gfx/p_multi.lmp");
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
+ x = (320/2) - ((12*8)/2) + 4;
+ M_DrawTextBox (x-8, 32, 12, 1);
+ M_Print (x, 40, "Searching...");
+
+ if(slistInProgress)
+ {
+ NET_Poll();
+ return;
+ }
+
+ if (! searchComplete)
+ {
+ searchComplete = true;
+ searchCompleteTime = realtime;
+ }
+
+ if (hostCacheCount)
+ {
+ M_Menu_ServerList_f ();
+ return;
+ }
+
+ M_PrintWhite ((320/2) - ((22*8)/2), 64, "No Quake servers found");
+ if ((realtime - searchCompleteTime) < 3.0)
+ return;
+
+ M_Menu_LanConfig_f ();
+}
+
+
+void M_InetSearch_Key (int key)
+{
+}
+
//=============================================================================
/* SLIST MENU */
M_DrawCharacter (0, 32 + slist_cursor*8, 12+((int)(realtime*4)&1));
if (*m_return_reason)
- M_PrintWhite (16, 148, m_return_reason);
+ M_PrintWhite (16, 168, m_return_reason);
}
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"))
projects / xonotic / darkplaces.git / blobdiff