*/
#include "quakedef.h"
+#include "image.h"
-#ifdef _WIN32
-#include "winquake.h"
-#endif
-
-void (*vid_menudrawfn)(void);
-void (*vid_menukeyfn)(int key);
#define TYPE_DEMO 1
#define TYPE_GAME 2
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
DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
}
-void M_Print (float cx, float cy, char *str)
+void M_Print (float cx, float cy, const char *str)
{
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
}
-void M_PrintWhite (float cx, float cy, char *str)
+void M_PrintWhite (float cx, float cy, const char *str)
{
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
}
//=============================================================================
-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:
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");
}
M_BuildTranslationTable (menuplyr_top*16, menuplyr_bottom*16);
for (i = 0;i < menuplyr_width * menuplyr_height;i++)
- trans[i] = d_8to24table[translation[pixels[i]]];
+ trans[i] = palette_complete[translation[pixels[i]]];
Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)trans);
}
M_Print(16, y, " Customize controls");y += 8;
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, " Video Options");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;
Cbuf_AddText ("exec default.cfg\n");
break;
case 3:
- if (vid_menudrawfn)
- M_Menu_Video_f ();
+ M_Menu_Video_f ();
break;
case 4:
M_Menu_Options_Effects_f ();
}
}
-#define OPTIONS_EFFECTS_ITEMS 12
+#define OPTIONS_EFFECTS_ITEMS 16
int options_effects_cursor;
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;
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 (&r_detailtextures, !r_detailtextures.integer);
+ Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
break;
case 5:
- Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
+ Cvar_SetValueQuick (&cl_explosions, !cl_explosions.integer);
break;
case 6:
- Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
+ Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
break;
case 7:
- Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
+ Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
break;
case 8:
- Cvar_SetValueQuick (&cl_particles_bubbles, !cl_particles_bubbles.integer);
+ Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
break;
case 9:
- Cvar_SetValueQuick (&cl_particles_blood, !cl_particles_blood.integer);
+ Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
break;
case 10:
- Cvar_SetValueQuick (&cl_particles_blood_size, bound(2, cl_particles_blood_size.value + dir * 1, 20));
+ 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;
}
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;
{
{"+forward", "walk forward"},
{"+back", "backpedal"},
+{"+left", "turn left"},
+{"+right", "turn right"},
{"+moveleft", "step left"},
{"+moveright", "step right"},
{"+jump", "jump / swim up"},
//=============================================================================
/* VIDEO MENU */
+#define VIDEO_ITEMS 5
+
+int video_cursor = 0;
+int video_cursor_table[] = {56, 68, 80, 92, 116};
+unsigned short video_resolutions[][2] = {{512,384}, {640,480}, {800,600}, {1024,768}, {1280,960}};
+int video_resolution;
+
+extern int current_vid_fullscreen;
+extern int current_vid_width;
+extern int current_vid_height;
+extern int current_vid_bitsperpixel;
+extern int current_vid_stencil;
+
+
void M_Menu_Video_f (void)
{
key_dest = key_menu;
m_state = m_video;
m_entersound = true;
+
+ // Look for the current resolution
+ for (video_resolution = 0; video_resolution < (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0])); video_resolution++)
+ {
+ if (video_resolutions[video_resolution][0] == current_vid_width &&
+ video_resolutions[video_resolution][1] == current_vid_height)
+ break;
+ }
+
+ // Default to 800x600 if we didn't find it
+ if (video_resolution == sizeof (video_resolutions) / sizeof (video_resolutions[0]))
+ {
+ video_resolution = 2;
+ Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
+ Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
+ }
}
void M_Video_Draw (void)
{
- (*vid_menudrawfn) ();
+ cachepic_t *p;
+ const char* string;
+
+ M_DrawPic(16, 4, "gfx/qplaque.lmp");
+ p = Draw_CachePic("gfx/vidmodes.lmp");
+ M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes.lmp");
+
+ // Resolution
+ M_Print(16, video_cursor_table[0], " Resolution");
+ string = va("%dx%d", video_resolutions[video_resolution][0], video_resolutions[video_resolution][1]);
+ M_Print (220, video_cursor_table[0], string);
+
+ // Bits per pixel
+ M_Print(16, video_cursor_table[1], " Bits per pixel");
+ M_Print (220, video_cursor_table[1], (vid_bitsperpixel.integer == 32) ? "32" : "16");
+
+ // Fullscreen
+ M_Print(16, video_cursor_table[2], " Fullscreen");
+ M_DrawCheckbox(220, video_cursor_table[2], vid_fullscreen.integer);
+
+ // Stencil
+ M_Print(16, video_cursor_table[3], " Stencil");
+ M_DrawCheckbox(220, video_cursor_table[3], vid_stencil.integer);
+
+ // "Apply" button
+ M_Print(220, video_cursor_table[4], "Apply");
+
+ // Cursor
+ M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
+}
+
+
+void M_Menu_Video_AdjustSliders (int dir)
+{
+ S_LocalSound ("misc/menu3.wav");
+
+ switch (video_cursor)
+ {
+ // Resolution
+ case 0:
+ {
+ int new_resolution = video_resolution + dir;
+ if (new_resolution < 0)
+ video_resolution = sizeof (video_resolutions) / sizeof (video_resolutions[0]) - 1;
+ else if (new_resolution > (int) (sizeof (video_resolutions) / sizeof (video_resolutions[0]) - 1))
+ video_resolution = 0;
+ else
+ video_resolution = new_resolution;
+
+ Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
+ Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
+ break;
+ }
+
+ // Bits per pixel
+ case 1:
+ Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32);
+ break;
+ case 2:
+ Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
+ break;
+ case 3:
+ Cvar_SetValueQuick (&vid_stencil, !vid_stencil.integer);
+ break;
+ }
}
void M_Video_Key (int key)
{
- (*vid_menukeyfn) (key);
+ switch (key)
+ {
+ case K_ESCAPE:
+ // vid_shared.c has a copy of the current video config. We restore it
+ Cvar_SetValueQuick(&vid_fullscreen, current_vid_fullscreen);
+ Cvar_SetValueQuick(&vid_width, current_vid_width);
+ Cvar_SetValueQuick(&vid_height, current_vid_height);
+ Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel);
+ Cvar_SetValueQuick(&vid_stencil, current_vid_stencil);
+
+ S_LocalSound ("misc/menu1.wav");
+ M_Menu_Options_f ();
+ break;
+
+ case K_ENTER:
+ m_entersound = true;
+ switch (video_cursor)
+ {
+ case 4:
+ Cbuf_AddText ("vid_restart\n");
+ M_Menu_Options_f ();
+ break;
+ default:
+ M_Menu_Video_AdjustSliders (1);
+ }
+ break;
+
+ case K_UPARROW:
+ S_LocalSound ("misc/menu1.wav");
+ video_cursor--;
+ if (video_cursor < 0)
+ video_cursor = VIDEO_ITEMS-1;
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("misc/menu1.wav");
+ video_cursor++;
+ if (video_cursor >= VIDEO_ITEMS)
+ video_cursor = 0;
+ break;
+
+ case K_LEFTARROW:
+ M_Menu_Video_AdjustSliders (-1);
+ break;
+
+ case K_RIGHTARROW:
+ M_Menu_Video_AdjustSliders (1);
+ break;
+ }
}
//=============================================================================
int m_quit_prevstate;
qboolean wasInMenus;
-char *quitMessage [] =
+char *quitMessage [] =
{
/* .........1.........2.... */
/*
" big loser in life. ",
" Press N to stay proud ",
" and successful! ",
-
+
" If you press Y to ",
" quit, I will summon ",
" Satan all over your ",
" hard drive! ",
-
+
" Um, Asmodeus dislikes ",
" his children trying to ",
" quit. Press Y to return",
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;
{"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"},
{"e1m7", "Altar of Stone"},
+ {"e2m8", "The Lair of Shial"},
+ {"e3m7", "The Pit of Cerberus"},
+ {"e4m8", "The Hall of the Epiphany"},
{"dm1", "Monolith Building 11"},
{"dm2", "Power!"},
{"dm3", "Area 15"},
+ {"e6m1", "Welcome to Your Life"},
{"e6m8", "Beauty and the Beast"},
{"cpbb01", "Crypt of Despair"},
{"crypt", "The Crypt"},
{"bb3_2k1", "Bodies Infusion"},
+ {"dcamp", "DeathCamp"},
+ {"highnoon", "HighNoon"},
{"qbb1", "The Confluence"},
{"qbb2", "KathartiK"},
{"qbb3", "Caleb's Woodland Retreat"},
- {"ded_simp", "Dead Simple"},
+
{"dranzbb6", "Black Coffee"},
- {"qe1m7", "The House of Chthon"}
+ {"fragm", "Frag'M"},
+ {"maim", "Maim"},
+ {"qe1m7", "The House of Chthon"},
+ {"simple", "Dead Simple"}
};
episode_t transfusionepisodes[] =
{
- {"Blood", 0, 9},
- {"Plasma Pack", 9, 4},
- {"Cryptic Passage", 13, 2},
- {"Blood 2", 15, 5},
- {"Custom", 20, 7}
+ {"Blood", 0, 8},
+ {"Blood Single Player", 8, 6},
+ {"Plasma Pack", 14, 5},
+ {"Cryptic Passage", 19, 2},
+ {"Blood 2", 21, 5},
+ {"Transfusion", 26, 6},
+ {"Conversions", 32, 5}
};
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 transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 5};
+gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 7};
typedef struct
{
if (maxplayers == 0)
maxplayers = svs.maxclients;
if (maxplayers < 2)
- maxplayers = svs.maxclientslimit;
+ maxplayers = MAX_SCOREBOARD;
}
M_Print (x, 146, " More than 64 players?? ");
M_Print (x, 154, " First, question your ");
M_Print (x, 162, " sanity, then email ");
- M_Print (x, 170, " havoc@gamevisions.com ");
+ M_Print (x, 170, " havoc@telefragged.com ");
}
else
{
{
case 1:
maxplayers += dir;
- if (maxplayers > svs.maxclientslimit)
+ if (maxplayers > MAX_SCOREBOARD)
{
- maxplayers = svs.maxclientslimit;
+ maxplayers = MAX_SCOREBOARD;
m_serverInfoMessage = true;
m_serverInfoMessageTime = realtime;
}
void M_Search_Draw (void)
{
+ const char* string;
cachepic_t *p;
int x;
return;
}
- M_PrintWhite ((320/2) - ((22*8)/2), 64, "No Quake servers found");
+ if (gamemode == GAME_TRANSFUSION)
+ string = "No Transfusion servers found";
+ else
+ string = "No Quake servers found";
+ M_PrintWhite ((320/2) - ((22*8)/2), 64, string);
if ((realtime - searchCompleteTime) < 3.0)
return;
{
}
+//=============================================================================
+/* 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)
+{
+ M_Search_Draw (); // it's the same one, so why bother?
+}
+
+
+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);
}
projects / xonotic / darkplaces.git / blobdiff