#define TYPE_GAME 2
#define TYPE_BOTH 3
-mempool_t *menu_mempool;
-
int NehGameType;
enum m_state_e m_state;
void M_Menu_Main_f (void);
void M_Menu_SinglePlayer_f (void);
+ void M_Menu_Transfusion_Episode_f (void);
+ void M_Menu_Transfusion_Skill_f (void);
void M_Menu_Load_f (void);
void M_Menu_Save_f (void);
void M_Menu_MultiPlayer_f (void);
void M_Menu_Reset_f (void);
void M_Menu_Video_f (void);
void M_Menu_Help_f (void);
+ void M_Menu_Credits_f (void);
void M_Menu_Quit_f (void);
void M_Menu_LanConfig_f (void);
void M_Menu_GameOptions_f (void);
void M_Main_Draw (void);
void M_SinglePlayer_Draw (void);
+ void M_Transfusion_Episode_Draw (void);
+ void M_Transfusion_Skill_Draw (void);
void M_Load_Draw (void);
void M_Save_Draw (void);
void M_MultiPlayer_Draw (void);
void M_Reset_Draw (void);
void M_Video_Draw (void);
void M_Help_Draw (void);
+ void M_Credits_Draw (void);
void M_Quit_Draw (void);
void M_LanConfig_Draw (void);
void M_GameOptions_Draw (void);
void M_Main_Key (int key, char ascii);
void M_SinglePlayer_Key (int key, char ascii);
+ void M_Transfusion_Episode_Key (int key, char ascii);
+ void M_Transfusion_Skill_Key (int key, char ascii);
void M_Load_Key (int key, char ascii);
void M_Save_Key (int key, char ascii);
void M_MultiPlayer_Key (int key, char ascii);
void M_Reset_Key (int key, char ascii);
void M_Video_Key (int key, char ascii);
void M_Help_Key (int key, char ascii);
+ void M_Credits_Key (int key, char ascii);
void M_Quit_Key (int key, char ascii);
void M_LanConfig_Key (int key, char ascii);
void M_GameOptions_Key (int key, char ascii);
// Nehahra
#define NumberOfNehahraDemos 34
-typedef struct
+typedef struct nehahrademonames_s
{
char *name;
char *desc;
void M_Background(int width, int height)
{
- menu_width = width;
- menu_height = height;
- menu_x = (vid.conwidth - menu_width) * 0.5;
- menu_y = (vid.conheight - menu_height) * 0.5;
+ menu_width = bound(1, width, vid_conwidth.integer);
+ menu_height = bound(1, height, vid_conheight.integer);
+ menu_x = (vid_conwidth.integer - menu_width) * 0.5;
+ menu_y = (vid_conheight.integer - 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);
+ DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0);
}
/*
DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
}
+void M_PrintColored(float cx, float cy, const char *str)
+{
+ DrawQ_ColoredString(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL);
+}
+
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);
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0);
}
-void M_ItemPrint(float cx, float cy, char *str, int unghosted)
+void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
{
if (unghosted)
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0);
}
-void M_DrawPic (float cx, float cy, char *picname)
+void M_DrawPic (float cx, float cy, const char *picname)
{
DrawQ_Pic (menu_x + cx, menu_y + cy, picname, 0, 0, 1, 1, 1, 1, 0);
}
-qbyte identityTable[256];
-qbyte translationTable[256];
+unsigned char identityTable[256];
+unsigned char translationTable[256];
void M_BuildTranslationTable(int top, int bottom)
{
int j;
- qbyte *dest, *source;
+ unsigned char *dest, *source;
for (j = 0; j < 256; j++)
identityTable[j] = j;
// draw left side
cx = x;
cy = y;
- M_DrawPic (cx, cy, "gfx/box_tl.lmp");
+ M_DrawPic (cx, cy, "gfx/box_tl");
for (n = 0; n < height; n++)
{
cy += 8;
- M_DrawPic (cx, cy, "gfx/box_ml.lmp");
+ M_DrawPic (cx, cy, "gfx/box_ml");
}
- M_DrawPic (cx, cy+8, "gfx/box_bl.lmp");
+ M_DrawPic (cx, cy+8, "gfx/box_bl");
// draw middle
cx += 8;
while (width > 0)
{
cy = y;
- M_DrawPic (cx, cy, "gfx/box_tm.lmp");
+ M_DrawPic (cx, cy, "gfx/box_tm");
for (n = 0; n < height; n++)
{
cy += 8;
if (n >= 1)
- M_DrawPic (cx, cy, "gfx/box_mm2.lmp");
+ M_DrawPic (cx, cy, "gfx/box_mm2");
else
- M_DrawPic (cx, cy, "gfx/box_mm.lmp");
+ M_DrawPic (cx, cy, "gfx/box_mm");
}
- M_DrawPic (cx, cy+8, "gfx/box_bm.lmp");
+ M_DrawPic (cx, cy+8, "gfx/box_bm");
width -= 2;
cx += 16;
}
// draw right side
cy = y;
- M_DrawPic (cx, cy, "gfx/box_tr.lmp");
+ M_DrawPic (cx, cy, "gfx/box_tr");
for (n = 0; n < height; n++)
{
cy += 8;
- M_DrawPic (cx, cy, "gfx/box_mr.lmp");
+ M_DrawPic (cx, cy, "gfx/box_mr");
}
- M_DrawPic (cx, cy+8, "gfx/box_br.lmp");
+ M_DrawPic (cx, cy+8, "gfx/box_br");
}
//=============================================================================
}
else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
MAIN_ITEMS = 6;
+ else if (gamemode == GAME_TRANSFUSION) {
+ if (sv.active && !cl.intermission && cl.islocalgame)
+ MAIN_ITEMS = 8;
+ else
+ MAIN_ITEMS = 7;
+ }
else
MAIN_ITEMS = 5;
int f;
cachepic_t *p;
- M_Background(320, 200);
+ if (gamemode == GAME_TRANSFUSION) {
+ int y1, y2, y3;
+ M_Background(640, 480);
+ p = Draw_CachePic ("gfx/tb-transfusion", false);
+ M_DrawPic (640/2 - p->width/2, 40, "gfx/tb-transfusion");
+ y2 = 120;
+ // 8 rather than MAIN_ITEMS to skip a number and not miss the last option
+ for (y1 = 1; y1 <= 8; y1++)
+ {
+ if (MAIN_ITEMS == 7 && y1 == 4)
+ y1++;
+ M_DrawPic (0, y2, va("gfx/mainmenu%i", y1));
+ y2 += 40;
+ }
+ if (MAIN_ITEMS == 7 && m_main_cursor > 2)
+ y3 = m_main_cursor + 2;
+ else
+ y3 = m_main_cursor + 1;
+ M_DrawPic (0, 120 + m_main_cursor * 40, va("gfx/mainmenu%iselected", y3));
+ return;
+ }
- M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/ttl_main.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main.lmp");
+ M_Background(320, 200);
+ M_DrawPic (16, 4, "gfx/qplaque");
+ p = Draw_CachePic ("gfx/ttl_main", false);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main");
// Nehahra
if (gamemode == GAME_NEHAHRA)
{
if (NehGameType == TYPE_BOTH)
- M_DrawPic (72, 32, "gfx/mainmenu.lmp");
+ M_DrawPic (72, 32, "gfx/mainmenu");
else if (NehGameType == TYPE_GAME)
- M_DrawPic (72, 32, "gfx/gamemenu.lmp");
+ M_DrawPic (72, 32, "gfx/gamemenu");
else
- M_DrawPic (72, 32, "gfx/demomenu.lmp");
+ M_DrawPic (72, 32, "gfx/demomenu");
}
else
- M_DrawPic (72, 32, "gfx/mainmenu.lmp");
+ M_DrawPic (72, 32, "gfx/mainmenu");
f = (int)(realtime * 10)%6;
- M_DrawPic (54, 32 + m_main_cursor * 20, va("gfx/menudot%i.lmp", f+1));
+ M_DrawPic (54, 32 + m_main_cursor * 20, va("gfx/menudot%i", f+1));
}
break;
}
}
+ else if (gamemode == GAME_TRANSFUSION) {
+ if (MAIN_ITEMS == 7)
+ {
+ switch (m_main_cursor)
+ {
+ case 0:
+ M_Menu_Transfusion_Episode_f ();
+ break;
+
+ case 1:
+ M_Menu_MultiPlayer_f ();
+ break;
+
+ case 2:
+ M_Menu_Options_f ();
+ break;
+
+ case 3:
+ M_Menu_Load_f ();
+ break;
+
+ case 4:
+ M_Menu_Help_f ();
+ break;
+
+ case 5:
+ M_Menu_Credits_f ();
+ break;
+
+ case 6:
+ M_Menu_Quit_f ();
+ break;
+ }
+ }
+ else
+ {
+ switch (m_main_cursor)
+ {
+ case 0:
+ M_Menu_Transfusion_Episode_f ();
+ break;
+
+ case 1:
+ M_Menu_MultiPlayer_f ();
+ break;
+
+ case 2:
+ M_Menu_Options_f ();
+ break;
+
+ case 3:
+ M_Menu_Save_f ();
+ break;
+
+ case 4:
+ M_Menu_Load_f ();
+ break;
+
+ case 5:
+ M_Menu_Help_f ();
+ break;
+
+ case 6:
+ M_Menu_Credits_f ();
+ break;
+
+ case 7:
+ M_Menu_Quit_f ();
+ break;
+ }
+ }
+ }
else
{
switch (m_main_cursor)
M_Background(320, 200);
- M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/ttl_sgl.lmp");
+ M_DrawPic (16, 4, "gfx/qplaque");
+ p = Draw_CachePic ("gfx/ttl_sgl", false);
// 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_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl");
M_DrawTextBox (60, 8 * 8, 23, 4);
if (gamemode == GAME_NEXUIZ)
{
int f;
- M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl.lmp");
- M_DrawPic (72, 32, "gfx/sp_menu.lmp");
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl");
+ M_DrawPic (72, 32, "gfx/sp_menu");
f = (int)(realtime * 10)%6;
- M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1));
+ M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i", f+1));
}
}
Cbuf_AddText ("maxplayers 1\n");
Cbuf_AddText ("deathmatch 0\n");
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");
+ if (gamemode == GAME_TRANSFUSION)
+ {
+ key_dest = key_menu;
+ M_Menu_Transfusion_Episode_f ();
+ break;
+ }
+ Cbuf_AddText ("startmap_sp\n");
break;
case 1:
void M_ScanSaves (void)
{
- int i, j;
+ int i, j, len;
char name[MAX_OSPATH];
- char *str;
+ char buf[SAVEGAME_COMMENT_LENGTH + 256];
+ const char *t;
qfile_t *f;
int version;
{
strcpy (m_filenames[i], "--- UNUSED SLOT ---");
loadable[i] = false;
- sprintf (name, "s%i.sav", i);
- f = FS_Open (name, "r", false);
+ sprintf (name, "s%i.sav", (int)i);
+ f = FS_Open (name, "rb", false, false);
if (!f)
continue;
- str = FS_Getline (f);
- sscanf (str, "%i\n", &version);
- str = FS_Getline (f);
- strlcpy (m_filenames[i], str, sizeof (m_filenames[i]));
+ // read enough to get the comment
+ len = FS_Read(f, buf, sizeof(buf) - 1);
+ buf[sizeof(buf) - 1] = 0;
+ t = buf;
+ // version
+ COM_ParseToken(&t, false);
+ version = atoi(com_token);
+ // description
+ COM_ParseToken(&t, false);
+ strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
// change _ back to space
for (j=0 ; j<SAVEGAME_COMMENT_LENGTH ; j++)
M_Background(320, 200);
- p = Draw_CachePic ("gfx/p_load.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp");
+ p = Draw_CachePic ("gfx/p_load", false);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load" );
for (i=0 ; i< MAX_SAVEGAMES; i++)
M_Print(16, 32 + 8*i, m_filenames[i]);
M_Background(320, 200);
- p = Draw_CachePic ("gfx/p_save.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp");
+ p = Draw_CachePic ("gfx/p_save", false);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save");
for (i=0 ; i<MAX_SAVEGAMES ; i++)
M_Print(16, 32 + 8*i, m_filenames[i]);
switch (k)
{
case K_ESCAPE:
- M_Menu_SinglePlayer_f ();
+ if (gamemode == GAME_TRANSFUSION)
+ M_Menu_Main_f ();
+ else
+ M_Menu_SinglePlayer_f ();
break;
case K_ENTER:
switch (k)
{
case K_ESCAPE:
- M_Menu_SinglePlayer_f ();
+ if (gamemode == GAME_TRANSFUSION)
+ M_Menu_Main_f ();
+ else
+ M_Menu_SinglePlayer_f ();
break;
case K_ENTER:
}
}
+//=============================================================================
+/* Transfusion Single Player Episode Menu */
+
+int m_episode_cursor;
+#define EPISODE_ITEMS 6
+
+void M_Menu_Transfusion_Episode_f (void)
+{
+ m_entersound = true;
+ m_state = m_transfusion_episode;
+ key_dest = key_menu;
+}
+
+void M_Transfusion_Episode_Draw (void)
+{
+ int y;
+ cachepic_t *p;
+ M_Background(640, 480);
+
+ p = Draw_CachePic ("gfx/tb-episodes", false);
+ M_DrawPic (640/2 - p->width/2, 40, "gfx/tb-episodes");
+ for (y = 0; y < EPISODE_ITEMS; y++){
+ M_DrawPic (0, 160 + y * 40, va("gfx/episode%i", y+1));
+ }
+
+ M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/episode%iselected", m_episode_cursor + 1));
+}
+
+void M_Transfusion_Episode_Key (int key, char ascii)
+{
+ switch (key)
+ {
+ case K_ESCAPE:
+ M_Menu_Main_f ();
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("sound/misc/menu1.wav");
+ m_episode_cursor++;
+ if (m_episode_cursor >= EPISODE_ITEMS)
+ m_episode_cursor = 0;
+ break;
+
+ case K_UPARROW:
+ S_LocalSound ("sound/misc/menu1.wav");
+ m_episode_cursor--;
+ if (m_episode_cursor < 0)
+ m_episode_cursor = EPISODE_ITEMS - 1;
+ break;
+
+ case K_ENTER:
+ Cbuf_AddText ("deathmatch 0\n");
+ m_entersound = true;
+ M_Menu_Transfusion_Skill_f ();
+ }
+}
+
+//=============================================================================
+/* Transfusion Single Player Skill Menu */
+
+int m_skill_cursor = 2;
+#define SKILL_ITEMS 5
+
+void M_Menu_Transfusion_Skill_f (void)
+{
+ m_entersound = true;
+ m_state = m_transfusion_skill;
+ key_dest = key_menu;
+}
+
+void M_Transfusion_Skill_Draw (void)
+{
+ int y;
+ cachepic_t *p;
+ M_Background(640, 480);
+
+ p = Draw_CachePic ("gfx/tb-difficulty", false);
+ M_DrawPic(640/2 - p->width/2, 40, "gfx/tb-difficulty");
+
+ for (y = 0; y < SKILL_ITEMS; y++)
+ {
+ M_DrawPic (0, 180 + y * 40, va("gfx/difficulty%i", y+1));
+ }
+ M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va("gfx/difficulty%iselected", m_skill_cursor + 1));
+}
+
+void M_Transfusion_Skill_Key (int key, char ascii)
+{
+ switch (key)
+ {
+ case K_ESCAPE:
+ M_Menu_Transfusion_Episode_f ();
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("sound/misc/menu1.wav");
+ m_skill_cursor++;
+ if (m_skill_cursor >= SKILL_ITEMS)
+ m_skill_cursor = 0;
+ break;
+
+ case K_UPARROW:
+ S_LocalSound ("sound/misc/menu1.wav");
+ m_skill_cursor--;
+ if (m_skill_cursor < 0)
+ m_skill_cursor = SKILL_ITEMS - 1;
+ break;
+
+ case K_ENTER:
+ m_entersound = true;
+ switch (m_skill_cursor)
+ {
+ case 0:
+ Cbuf_AddText ("skill 1\n");
+ break;
+ case 1:
+ Cbuf_AddText ("skill 2\n");
+ break;
+ case 2:
+ Cbuf_AddText ("skill 3\n");
+ break;
+ case 3:
+ Cbuf_AddText ("skill 4\n");
+ break;
+ case 4:
+ Cbuf_AddText ("skill 5\n");
+ break;
+ }
+ key_dest = key_game;
+ if (sv.active)
+ Cbuf_AddText ("disconnect\n");
+ Cbuf_AddText ("maxplayers 1\n");
+ Cbuf_AddText ("deathmatch 0\n");
+ Cbuf_AddText ("coop 0\n");
+ switch (m_episode_cursor)
+ {
+ case 0:
+ Cbuf_AddText ("map e1m1\n");
+ break;
+ case 1:
+ Cbuf_AddText ("map e2m1\n");
+ break;
+ case 2:
+ Cbuf_AddText ("map e3m1\n");
+ break;
+ case 3:
+ Cbuf_AddText ("map e4m1\n");
+ break;
+ case 4:
+ Cbuf_AddText ("map e6m1\n");
+ break;
+ case 5:
+ Cbuf_AddText ("map cp01\n");
+ break;
+ }
+ }
+}
//=============================================================================
/* MULTIPLAYER MENU */
int f;
cachepic_t *p;
+ if (gamemode == GAME_TRANSFUSION)
+ {
+ M_Background(640, 480);
+ p = Draw_CachePic ("gfx/tb-online", false);
+ M_DrawPic (640/2 - p->width/2, 140, "gfx/tb-online");
+ for (f = 1; f <= MULTIPLAYER_ITEMS; f++)
+ M_DrawPic (0, 180 + f*40, va("gfx/online%i", f));
+ M_DrawPic (0, 220 + m_multiplayer_cursor * 40, va("gfx/online%iselected", m_multiplayer_cursor + 1));
+ return;
+ }
M_Background(320, 200);
- M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
- M_DrawPic (72, 32, "gfx/mp_menu.lmp");
+ M_DrawPic (16, 4, "gfx/qplaque");
+ p = Draw_CachePic ("gfx/p_multi", false);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
+ M_DrawPic (72, 32, "gfx/mp_menu");
f = (int)(realtime * 10)%6;
- M_DrawPic (54, 32 + m_multiplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1));
+ M_DrawPic (54, 32 + m_multiplayer_cursor * 20, va("gfx/menudot%i", f+1));
}
}
static int menuplyr_width, menuplyr_height, menuplyr_top, menuplyr_bottom, menuplyr_load;
-static qbyte *menuplyr_pixels;
+static unsigned char *menuplyr_pixels;
static unsigned int *menuplyr_translated;
typedef struct ratetable_s
M_Background(320, 200);
- M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
+ M_DrawPic (16, 4, "gfx/qplaque");
+ p = Draw_CachePic ("gfx/p_multi", false);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
M_Print(64, 40, "Your name");
M_DrawTextBox (160, 32, 16, 1);
- M_Print(168, 40, setup_myname);
+ M_PrintColored(168, 40, setup_myname);
if (gamemode != GAME_GOODVSBAD2)
{
// LordHavoc: rewrote this code greatly
if (menuplyr_load)
{
- qbyte *data, *f;
+ unsigned char *data, *f;
+ fs_offset_t filesize;
menuplyr_load = false;
menuplyr_top = -1;
menuplyr_bottom = -1;
- if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true)))
+ if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize)))
{
- data = LoadLMPAs8Bit (f, 0, 0);
+ data = LoadLMP (f, filesize, 0, 0, true);
menuplyr_width = image_width;
menuplyr_height = image_height;
Mem_Free(f);
- menuplyr_pixels = Mem_Alloc(menu_mempool, menuplyr_width * menuplyr_height);
- menuplyr_translated = Mem_Alloc(menu_mempool, menuplyr_width * menuplyr_height * 4);
+ menuplyr_pixels = (unsigned char *)Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height);
+ menuplyr_translated = (unsigned int *)Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height * 4);
memcpy(menuplyr_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++)
menuplyr_translated[i] = palette_complete[translationTable[menuplyr_pixels[i]]];
- Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)menuplyr_translated);
+ Draw_NewPic("gfx/menuplyr", menuplyr_width, menuplyr_height, true, (unsigned char *)menuplyr_translated);
}
- M_DrawPic(160, 48, "gfx/bigbox.lmp");
- M_DrawPic(172, 56, "gfx/menuplyr.lmp");
+ M_DrawPic(160, 48, "gfx/bigbox");
+ M_DrawPic(172, 56, "gfx/menuplyr");
}
if (setup_cursor == 0)
break;
default:
- if (ascii < 32 || ascii > 126)
+ if (ascii < 32)
break;
if (setup_cursor == 0)
{
- l = strlen(setup_myname);
+ l = (int)strlen(setup_myname);
if (l < 15)
{
setup_myname[l+1] = 0;
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1));
else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&r_sky, !r_sky.integer);
+ Cvar_SetValueQuick (&scr_screenshot_gamma, bound(0.1, scr_screenshot_gamma.value + dir * 0.1, 4));
else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
+ Cvar_SetValueQuick (&r_sky, !r_sky.integer);
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
else if (options_cursor == optnum++)
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&r_textshadow, !r_textshadow.integer);
else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5));
+ Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 6));
else if (options_cursor == optnum++)
Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
else if (options_cursor == optnum++)
int opty;
int optcursor;
-void M_Options_PrintCommand(char *s, int enabled)
+void M_Options_PrintCommand(const char *s, int enabled)
{
if (opty >= 32)
{
optnum++;
}
-void M_Options_PrintCheckbox(char *s, int enabled, int yes)
+void M_Options_PrintCheckbox(const char *s, int enabled, int yes)
{
if (opty >= 32)
{
DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
M_ItemPrint(0, opty, s, enabled);
- M_DrawCheckbox(0 + strlen(s) * 8 + 8, opty, yes);
+ M_DrawCheckbox(0 + (int)strlen(s) * 8 + 8, opty, yes);
}
opty += 8;
optnum++;
}
-void M_Options_PrintSlider(char *s, int enabled, float value, float minvalue, float maxvalue)
+void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue)
{
if (opty >= 32)
{
DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
M_ItemPrint(0, opty, s, enabled);
- M_DrawSlider(0 + strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
+ M_DrawSlider(0 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
}
opty += 8;
optnum++;
int visible;
cachepic_t *p;
- M_Background(320, 240);
+ M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer));
- 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");
+ M_DrawPic(16, 4, "gfx/qplaque");
+ p = Draw_CachePic("gfx/p_option", false);
+ M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optnum = 0;
optcursor = options_cursor;
- visible = (vid.conheight - 32) / 8;
+ visible = (menu_height - 32) / 8;
opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8;
M_Options_PrintCommand( "Customize controls", true);
M_Options_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170);
M_Options_PrintCheckbox(" JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer);
M_Options_PrintSlider( " JPEG quality", jpeg_dll != NULL, scr_screenshot_jpeg_quality.value, 0, 1);
+ M_Options_PrintSlider( " Screenshot Gamma", jpeg_dll != NULL, scr_screenshot_gamma.value, 0.1, 4);
M_Options_PrintCheckbox(" Sky", true, r_sky.integer);
- M_Options_PrintCheckbox(" Texture Combine", true, gl_combine.integer);
M_Options_PrintCheckbox(" Dithering", true, gl_dither.integer);
M_Options_PrintSlider( "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
M_Options_PrintSlider( " Game Speed", sv.active, slowmo.value, 0, 5);
}
}
-#define OPTIONS_EFFECTS_ITEMS 37
+#define OPTIONS_EFFECTS_ITEMS 35
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 cl_stainmaps_clearonload;
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;
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 (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
+ if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quake, !cl_particles_quake.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_explosions_shell, !cl_particles_explosions_shell.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_explosionclip, !r_explosionclip.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps, !cl_stainmaps.integer);
- else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmapsclearonload, !cl_stainmapsclearonload.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_stainmaps_clearonload, !cl_stainmaps_clearonload.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_decals, !cl_decals.integer);
- else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_detailtextures, !r_detailtextures.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_bulletimpacts, !cl_particles_bulletimpacts.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_smoke, !cl_particles_smoke.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_sparks, !cl_particles_sparks.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterwarp, bound(0, r_waterwarp.value + dir * 0.1, 1));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_wateralpha, bound(0, r_wateralpha.value + dir * 0.1, 1));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10));
- else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_watershader, bound(0, r_watershader.value + dir * 0.25, 10));
}
void M_Options_Effects_Draw (void)
int visible;
cachepic_t *p;
- M_Background(320, 200);
+ M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer));
- 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");
+ M_DrawPic(16, 4, "gfx/qplaque");
+ p = Draw_CachePic("gfx/p_option", false);
+ M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optcursor = options_effects_cursor;
optnum = 0;
- visible = (vid.conheight - 32) / 8;
+ visible = (menu_height - 32) / 8;
opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8;
- M_Options_PrintSlider( " Lights Per Model", true, r_modellights.value, 0, 8);
M_Options_PrintSlider( " Corona Intensity", true, r_coronas.value, 0, 4);
M_Options_PrintCheckbox(" Use Only Coronas", true, gl_flashblend.integer);
M_Options_PrintCheckbox(" Particles", true, cl_particles.integer);
+ M_Options_PrintCheckbox(" Quake-style Particles", true, cl_particles_quake.integer);
M_Options_PrintSlider( " Particles Quality", true, cl_particles_quality.value, 1, 4);
M_Options_PrintCheckbox(" Explosion Shell", true, cl_particles_explosions_shell.integer);
M_Options_PrintCheckbox(" Explosion Shell Clip", true, r_explosionclip.integer);
M_Options_PrintCheckbox(" Stainmaps", true, cl_stainmaps.integer);
- M_Options_PrintCheckbox("Onload Clear Stainmaps", true, cl_stainmapsclearonload.integer);
+ M_Options_PrintCheckbox("Onload Clear Stainmaps", true, cl_stainmaps_clearonload.integer);
M_Options_PrintCheckbox(" Decals", true, cl_decals.integer);
- M_Options_PrintCheckbox(" Detail Texturing", true, r_detailtextures.integer);
M_Options_PrintCheckbox(" Bullet Impacts", true, cl_particles_bulletimpacts.integer);
M_Options_PrintCheckbox(" Smoke", true, cl_particles_smoke.integer);
M_Options_PrintCheckbox(" Sparks", true, cl_particles_sparks.integer);
M_Options_PrintSlider( " Underwater View Warp", true, r_waterwarp.value, 0, 1);
M_Options_PrintSlider( " Water Alpha (opacity)", true, r_wateralpha.value, 0, 1);
M_Options_PrintSlider( " Water Movement", true, r_waterscroll.value, 0, 10);
- M_Options_PrintSlider( " GeForce3 Water Shader", true, r_watershader.value, 0, 10);
}
}
-#define OPTIONS_GRAPHICS_ITEMS 7
+#define OPTIONS_GRAPHICS_ITEMS 14
int options_graphics_cursor;
extern cvar_t r_shadow_realtime_world_dlightshadows;
extern cvar_t r_shadow_realtime_world_lightmaps;
extern cvar_t r_shadow_realtime_world_shadows;
+extern cvar_t r_bloom;
+extern cvar_t r_bloom_intensity;
+extern cvar_t r_bloom_power;
+extern cvar_t r_bloom_blur;
+extern cvar_t r_bloom_resolution;
+extern cvar_t gl_picmip;
void M_Menu_Options_Graphics_AdjustSliders (int dir)
{
int optnum;
S_LocalSound ("sound/misc/menu3.wav");
-
+
optnum = 0;
if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss, bound(0, r_shadow_gloss.integer + dir, 2));
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, 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);
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom, !r_bloom.integer);
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_intensity, bound(1, r_bloom_intensity.value + dir * 1, 16));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_power, bound(1, r_bloom_power.value + dir * 1, 16));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_blur, bound(1, r_bloom_blur.value + dir * 1, 16));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_resolution, bound(64, r_bloom_resolution.value + dir * 64, 2048));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
+ else if (options_graphics_cursor == optnum++) Cbuf_AddText ("r_restart\n");
}
int visible;
cachepic_t *p;
- M_Background(320, 200);
+ M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer));
- 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");
+ M_DrawPic(16, 4, "gfx/qplaque");
+ p = Draw_CachePic("gfx/p_option", false);
+ M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optcursor = options_graphics_cursor;
optnum = 0;
- visible = (vid.conheight - 32) / 8;
+ visible = (menu_height - 32) / 8;
opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8;
M_Options_PrintSlider( " Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
M_Options_PrintCheckbox("RT World DLight Shadows", true, r_shadow_realtime_world_dlightshadows.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);
+ M_Options_PrintCheckbox(" Bloom Effect", true, r_bloom.integer);
+ M_Options_PrintSlider( " Bloom Intensity", true, r_bloom_intensity.value, 1, 16);
+ M_Options_PrintSlider( " Bloom Power", true, r_bloom_power.value, 1, 16);
+ M_Options_PrintSlider( " Bloom Blur", true, r_bloom_blur.value, 1, 16);
+ M_Options_PrintSlider( " Bloom Resolution", true, r_bloom_resolution.value, 64, 2048);
+ M_Options_PrintSlider( " Texture Quality", true, gl_picmip.value, 3, 0);
+ M_Options_PrintCommand( " Restart Renderer", true);
}
M_Background(320, 256);
- 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");
+ M_DrawPic(16, 4, "gfx/qplaque");
+ p = Draw_CachePic("gfx/p_option", false);
+ M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optcursor = options_colorcontrol_cursor;
optnum = 0;
- visible = (vid.conheight - 32) / 8;
+ visible = (menu_height - 32) / 8;
opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_COLORCONTROL_ITEMS - visible)) * 8;
M_Options_PrintCommand( " Reset to defaults", true);
opty += 4;
DrawQ_Fill(menu_x, menu_y + opty, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);opty += 4;
- s = (float) 312 / 2 * vid.realwidth / vid.conwidth;
- t = (float) 4 / 2 * vid.realheight / vid.conheight;
- DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);opty += 4;
+ s = (float) 312 / 2 * vid.width / vid_conwidth.integer;
+ t = (float) 4 / 2 * vid.height / vid_conheight.integer;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern", 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);opty += 4;
DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,0,0,1, 0,1, 0,0,0,1, 1,1, 1,0,0,1, 0);opty += 4;
- DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);opty += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern", 312, 4, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);opty += 4;
DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,1,0,1, 0,1, 0,0,0,1, 1,1, 0,1,0,1, 0);opty += 4;
- DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);opty += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern", 312, 4, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);opty += 4;
DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,0,1,1, 0,1, 0,0,0,1, 1,1, 0,0,1,1, 0);opty += 4;
- DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);opty += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern", 312, 4, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);opty += 4;
DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,1,1,1, 0,1, 0,0,0,1, 1,1, 1,1,1,1, 0);opty += 4;
c = menu_options_colorcontrol_correctionvalue.value; // intensity value that should be matched up to a 50% dither to 'correct' quake
- s = (float) 48 / 2 * vid.realwidth / vid.conwidth;
- t = (float) 48 / 2 * vid.realheight / vid.conheight;
+ s = (float) 48 / 2 * vid.width / vid_conwidth.integer;
+ t = (float) 48 / 2 * vid.height / vid_conheight.integer;
u = s * 0.5;
v = t * 0.5;
opty += 8;
x = 4;
DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, 0, 0, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0);
x += 80;
DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, c, 0, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0);
x += 80;
DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, 0, 0, c, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0);
x += 80;
DrawQ_Fill(menu_x + x, menu_y + opty, 64, 48, c, c, c, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, "gfx/colorcontrol/ditherpattern", 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0);
}
#define NUMKEYS 5
-void M_FindKeysForCommand (char *command, int *keys)
+void M_FindKeysForCommand (const char *command, int *keys)
{
int count;
int j;
int keys[NUMKEYS];
int y;
cachepic_t *p;
- char keystring[1024];
+ char keystring[MAX_INPUTLINE];
M_Background(320, 48 + 8 * numcommands);
- p = Draw_CachePic ("gfx/ttl_cstm.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp");
+ p = Draw_CachePic ("gfx/ttl_cstm", false);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm");
if (bind_grab)
M_Print(12, 32, "Press a key or button for this action");
{
switch (key)
{
+ case 'Y':
+ case 'y':
+ Cbuf_AddText ("exec default.cfg\n");
+ // no break here since we also exit the menu
+
case K_ESCAPE:
case 'n':
case 'N':
m_entersound = true;
break;
- case 'Y':
- case 'y':
- Cbuf_AddText ("exec default.cfg\n");
- break;
-
default:
break;
}
//=============================================================================
/* VIDEO MENU */
-#define VIDEO_ITEMS 5
+// note: if modes are added to the beginning of this list, update VID_DEFAULT
+typedef struct video_resolution_s
+{
+ const char *type;
+ int width, height;
+ int conwidth, conheight;
+ double pixelheight; // pixel aspect
+}
+video_resolution_t;
+video_resolution_t video_resolutions[] =
+{
+{"Standard 4x3" , 320, 240, 320, 240, 1 },
+{"Standard 4x3" , 400, 300, 400, 300, 1 },
+{"Standard 4x3" , 512, 384, 512, 384, 1 },
+{"Standard 4x3" , 640, 480, 640, 480, 1 },
+{"Standard 4x3" , 800, 600, 640, 480, 1 },
+{"Standard 4x3" , 1024, 768, 640, 480, 1 },
+{"Standard 4x3" , 1152, 864, 640, 480, 1 },
+{"Standard 4x3" , 1280, 960, 640, 480, 1 },
+{"Standard 4x3" , 1600,1200, 640, 480, 1 },
+{"Standard 4x3" , 1792,1344, 640, 480, 1 },
+{"Standard 4x3" , 1920,1440, 640, 480, 1 },
+{"Standard 4x3" , 2048,1536, 640, 480, 1 },
+{"Short Pixel (CRT) 5x4" , 320, 256, 320, 256, 0.9375},
+{"Short Pixel (CRT) 5x4" , 640, 512, 640, 512, 0.9375},
+{"Short Pixel (CRT) 5x4" , 1280,1024, 640, 512, 0.9375},
+{"Tall Pixel (CRT) 8x5" , 320, 200, 320, 200, 1.2 },
+{"Tall Pixel (CRT) 8x5" , 640, 400, 640, 400, 1.2 },
+{"Tall Pixel (CRT) 8x5" , 840, 525, 640, 400, 1.2 },
+{"Tall Pixel (CRT) 8x5" , 960, 600, 640, 400, 1.2 },
+{"Tall Pixel (CRT) 8x5" , 1680,1050, 640, 400, 1.2 },
+{"Tall Pixel (CRT) 8x5" , 1920,1200, 640, 400, 1.2 },
+{"Square Pixel (LCD) 5x4" , 320, 256, 320, 256, 1 },
+{"Square Pixel (LCD) 5x4" , 640, 512, 640, 512, 1 },
+{"Square Pixel (LCD) 5x4" , 1280,1024, 640, 512, 1 },
+{"WideScreen 5x3" , 640, 384, 640, 384, 1 },
+{"WideScreen 5x3" , 1280, 768, 640, 384, 1 },
+{"WideScreen 8x5" , 320, 200, 320, 200, 1 },
+{"WideScreen 8x5" , 640, 400, 640, 400, 1 },
+{"WideScreen 8x5" , 840, 525, 640, 400, 1 },
+{"WideScreen 8x5" , 960, 600, 640, 400, 1 },
+{"WideScreen 8x5" , 1680,1050, 640, 400, 1 },
+{"WideScreen 8x5" , 1920,1200, 640, 400, 1 },
+{"WideScreen 8x5" , 2560,1600, 640, 400, 1 },
+{"WideScreen 8x5" , 3840,2400, 640, 400, 1 },
+{"WideScreen 14x9" , 840, 540, 640, 400, 1 },
+{"WideScreen 14x9" , 1680,1080, 640, 400, 1 },
+{"WideScreen 16x9" , 640, 360, 640, 360, 1 },
+{"WideScreen 16x9" , 683, 384, 683, 384, 1 },
+{"WideScreen 16x9" , 960, 540, 640, 360, 1 },
+{"WideScreen 16x9" , 1280, 720, 640, 360, 1 },
+{"WideScreen 16x9" , 1366, 768, 683, 384, 1 },
+{"WideScreen 16x9" , 1920,1080, 640, 360, 1 },
+{"WideScreen 16x9" , 2560,1440, 640, 360, 1 },
+{"WideScreen 16x9" , 3840,2160, 640, 360, 1 },
+{"NTSC 3x2" , 360, 240, 360, 240, 1.125 },
+{"NTSC 3x2" , 720, 480, 720, 480, 1.125 },
+{"PAL 14x11" , 360, 283, 360, 283, 0.9545},
+{"PAL 14x11" , 720, 566, 360, 566, 0.9545},
+{"NES 8x7" , 256, 224, 256, 224, 1.1667},
+{"SNES 8x7" , 512, 448, 512, 448, 1.1667},
+{NULL, 0, 0, 0, 0, 0}
+};
+// this is the number of the default mode (640x480) in the list above
+#define VID_DEFAULT 3
+#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
+#define VIDEO_ITEMS 7
int video_cursor = 0;
-int video_cursor_table[] = {56, 68, 80, 100, 120};
-// note: if modes are added to the beginning of this list, update the
-// video_resolution = x; in M_Menu_Video_f below
-unsigned short video_resolutions[][2] = {{320,240}, {400,300}, {512,384}, {640,480}, {800,600}, {1024,768}, {1152,864}, {1280,960}, {1280,1024}, {1600,1200}, {1792,1344}, {1920,1440}, {2048,1536}, {0,0}};
-// this is the number of the 640x480 mode in the list
-#define VID_640 3
-#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
+int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162};
int video_resolution;
-extern int current_vid_fullscreen;
-extern int current_vid_width;
-extern int current_vid_height;
-extern int current_vid_bitsperpixel;
-
-
void M_Menu_Video_f (void)
{
+ int i;
+
key_dest = key_menu;
m_state = m_video;
m_entersound = true;
- // Look for the current resolution
- for (video_resolution = 0; video_resolution < VID_RES_COUNT; video_resolution++)
- {
- if (video_resolutions[video_resolution][0] == current_vid_width &&
- video_resolutions[video_resolution][1] == current_vid_height)
- break;
- }
-
- // Default to VID_640 if we didn't find it
- if (video_resolution == VID_RES_COUNT)
+ // Look for the closest match to the current resolution
+ video_resolution = 0;
+ for (i = 1;i < VID_RES_COUNT;i++)
{
- // may need to update this number if mode list changes
- video_resolution = VID_640;
- Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
- Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
+ // if the new mode would be a worse match in width, skip it
+ if (fabs(video_resolutions[i].width - vid.width) > fabs(video_resolutions[video_resolution].width - vid.width))
+ continue;
+ // if it is equal in width, check height
+ if (video_resolutions[i].width == vid.width && video_resolutions[video_resolution].width == vid.width)
+ {
+ // if the new mode would be a worse match in height, skip it
+ if (fabs(video_resolutions[i].height - vid.height) > fabs(video_resolutions[video_resolution].height - vid.height))
+ continue;
+ // if it is equal in width and height, check pixel aspect
+ if (video_resolutions[i].height == vid.height && video_resolutions[video_resolution].height == vid.height)
+ {
+ // if the new mode would be a worse match in pixel aspect, skip it
+ if (fabs(video_resolutions[i].pixelheight - vid_pixelheight.value) > fabs(video_resolutions[video_resolution].pixelheight - vid_pixelheight.value))
+ continue;
+ // if it is equal in everything, skip it (prefer earlier modes)
+ if (video_resolutions[i].pixelheight == vid_pixelheight.value && video_resolutions[video_resolution].pixelheight == vid_pixelheight.value)
+ continue;
+ // better match for width, height, and pixel aspect
+ video_resolution = i;
+ }
+ else // better match for width and height
+ video_resolution = i;
+ }
+ else // better match for width
+ video_resolution = i;
}
}
void M_Video_Draw (void)
{
cachepic_t *p;
- const char* string;
M_Background(320, 200);
- M_DrawPic(16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic("gfx/vidmodes.lmp");
- M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes.lmp");
+ M_DrawPic(16, 4, "gfx/qplaque");
+ p = Draw_CachePic("gfx/vidmodes", false);
+ M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes");
- // 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);
+ // Current Resolution
+ M_Print(16, video_cursor_table[0], " Current Resolution");
+ if (vid_supportrefreshrate && vid.fullscreen)
+ M_Print(220, video_cursor_table[0], va("%dx%d %dhz", vid.width, vid.height, vid.refreshrate));
+ else
+ M_Print(220, video_cursor_table[0], va("%dx%d", vid.width, vid.height));
+
+ // Proposed Resolution
+ M_Print(16, video_cursor_table[1], " New Resolution");
+ M_Print(220, video_cursor_table[1], va("%dx%d", video_resolutions[video_resolution].width, video_resolutions[video_resolution].height));
+ M_Print(96, video_cursor_table[1] + 8, va("Type: %s", video_resolutions[video_resolution].type));
// 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");
+ M_Print(16, video_cursor_table[2], " Bits per pixel");
+ M_Print(220, video_cursor_table[2], (vid_bitsperpixel.integer == 32) ? "32" : "16");
+
+ // Refresh Rate
+ M_ItemPrint(16, video_cursor_table[3], " Refresh Rate", vid_supportrefreshrate);
+ M_DrawSlider(220, video_cursor_table[3], vid_refreshrate.integer, 60, 150);
// Fullscreen
- M_Print(16, video_cursor_table[2], " Fullscreen");
- M_DrawCheckbox(220, video_cursor_table[2], vid_fullscreen.integer);
+ M_Print(16, video_cursor_table[4], " Fullscreen");
+ M_DrawCheckbox(220, video_cursor_table[4], vid_fullscreen.integer);
// "Apply" button
- M_Print(220, video_cursor_table[3], "Apply");
+ M_Print(220, video_cursor_table[5], "Apply");
// Vertical Sync
- M_ItemPrint (0, video_cursor_table[4], " Vertical Sync", gl_videosyncavailable);
- M_DrawCheckbox(220, video_cursor_table[4], vid_vsync.integer);
+ M_ItemPrint(16, video_cursor_table[6], " Vertical Sync", gl_videosyncavailable);
+ M_DrawCheckbox(220, video_cursor_table[6], vid_vsync.integer);
// Cursor
M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
switch (video_cursor)
{
// Resolution
- case 0:
+ case 1:
{
- int new_resolution = video_resolution + dir;
- if (gamemode == GAME_FNIGGIUM ? new_resolution < VID_640 : new_resolution < 0)
- video_resolution = VID_RES_COUNT - 1;
- else if (new_resolution > VID_RES_COUNT - 1)
- video_resolution = gamemode == GAME_FNIGGIUM ? VID_640 : 0;
- else
- video_resolution = new_resolution;
-
- Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
- Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
+ int r;
+ for(r = 0;r < VID_RES_COUNT;r++)
+ {
+ video_resolution += dir;
+ if (video_resolution >= VID_RES_COUNT)
+ video_resolution = 0;
+ if (video_resolution < 0)
+ video_resolution = VID_RES_COUNT - 1;
+ if (video_resolutions[video_resolution].width >= vid_minwidth.integer && video_resolutions[video_resolution].height >= vid_minheight.integer)
+ break;
+ }
break;
}
// Bits per pixel
- case 1:
+ case 2:
Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32);
break;
- case 2:
+ // Refresh Rate
+ case 3:
+ Cvar_SetValueQuick (&vid_refreshrate, vid_refreshrate.integer + dir);
+ break;
+ case 4:
Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
break;
- case 4:
+ case 6:
Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
break;
}
{
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_fullscreen, vid.fullscreen);
+ Cvar_SetValueQuick(&vid_bitsperpixel, vid.bitsperpixel);
+ if (vid_supportrefreshrate)
+ Cvar_SetValueQuick(&vid_refreshrate, vid.refreshrate);
S_LocalSound ("sound/misc/menu1.wav");
M_Menu_Options_f ();
m_entersound = true;
switch (video_cursor)
{
- case 3:
+ case 5:
+ Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution].width);
+ Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution].height);
+ Cvar_SetValueQuick (&vid_conwidth, video_resolutions[video_resolution].conwidth);
+ Cvar_SetValueQuick (&vid_conheight, video_resolutions[video_resolution].conheight);
+ Cvar_SetValueQuick (&vid_pixelheight, video_resolutions[video_resolution].pixelheight);
Cbuf_AddText ("vid_restart\n");
M_Menu_Options_f ();
break;
void M_Help_Draw (void)
{
M_Background(320, 200);
- M_DrawPic (0, 0, va("gfx/help%i.lmp", help_page));
+ M_DrawPic (0, 0, va("gfx/help%i", help_page));
}
}
+//=============================================================================
+/* CEDITS MENU */
+
+void M_Menu_Credits_f (void)
+{
+ key_dest = key_menu;
+ m_state = m_credits;
+ m_entersound = true;
+}
+
+
+
+void M_Credits_Draw (void)
+{
+ M_Background(640, 480);
+ DrawQ_Pic (0, 0, "gfx/creditsmiddle", 0, 0, 1, 1, 1, 1, 0);
+ M_Print (640/2 - 14/2*8, 236, "Coming soon...");
+ DrawQ_Pic (0, 0, "gfx/creditstop", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (0, 433, "gfx/creditsbottom", 0, 0, 1, 1, 1, 1, 0);
+}
+
+
+void M_Credits_Key (int key, char ascii)
+{
+ M_Menu_Main_f ();
+}
+
//=============================================================================
/* QUIT MENU */
case GAME_HIPNOTIC:
case GAME_ROGUE:
case GAME_NEHAHRA:
+ case GAME_DEFEATINDETAIL2:
if (request-- == 0) return M_QuitMessage("Are you gonna quit","this game just like","everything else?",NULL,NULL,NULL,NULL,NULL);
if (request-- == 0) return M_QuitMessage("Milord, methinks that","thou art a lowly","quitter. Is this true?",NULL,NULL,NULL,NULL,NULL);
if (request-- == 0) return M_QuitMessage("Do I need to bust your","face open for trying","to quit?",NULL,NULL,NULL,NULL,NULL);
case 'N':
if (wasInMenus)
{
- m_state = m_quit_prevstate;
+ m_state = (enum m_state_e)m_quit_prevstate;
m_entersound = true;
}
else
int i, l, linelength, firstline, lastline, lines;
for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_quit_message[i];i++)
{
- if ((l = strlen(m_quit_message[i])))
+ if ((l = (int)strlen(m_quit_message[i])))
{
if (firstline > i)
firstline = i;
M_Background(320, 200);
- M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/p_multi.lmp");
+ M_DrawPic (16, 4, "gfx/qplaque");
+ p = Draw_CachePic ("gfx/p_multi", false);
basex = (320-p->width)/2;
- M_DrawPic (basex, 4, "gfx/p_multi.lmp");
+ M_DrawPic (basex, 4, "gfx/p_multi");
if (StartingGame)
startJoin = "New Game";
break;
default:
- if (ascii < 32 || ascii > 126)
+ if (ascii < 32)
break;
if (lanConfig_cursor == 2)
{
- l = strlen(lanConfig_joinname);
+ l = (int)strlen(lanConfig_joinname);
if (l < 21)
{
lanConfig_joinname[l+1] = 0;
break;
if (lanConfig_cursor == 0)
{
- l = strlen(lanConfig_portname);
+ l = (int)strlen(lanConfig_portname);
if (l < 5)
{
lanConfig_portname[l+1] = 0;
//=============================================================================
/* GAME OPTIONS MENU */
-typedef struct
+typedef struct level_s
{
char *name;
char *description;
} level_t;
-typedef struct
+typedef struct episode_s
{
char *description;
int firstLevel;
int levels;
} episode_t;
-typedef struct
+typedef struct gamelevels_s
{
char *gamename;
level_t *levels;
{"cpbb04", "Deadly Inspirations"},
{"b2a15", "Area 15 (B2)"},
+ {"b2bodies", "BB_Bodies (B2)"},
+ {"b2cabana", "BB_Cabana"},
+ {"b2power", "BB_Power"},
{"barena", "Blood Arena"},
{"bkeep", "Blood Keep"},
{"bstar", "Brown Star"},
{"fragm", "Frag'M"},
{"maim", "Maim"},
{"qe1m7", "The House of Chthon"},
- {"qmorbias", "Dm-Morbias"},
+ {"qdm1", "Place of Two Deaths"},
+ {"qdm4", "The Bad Place"},
+ {"qdm5", "The Cistern"},
+ {"qmorbias", "DM-Morbias"},
{"simple", "Dead Simple"}
};
{"Post Mortem", 45, 9},
{"Cryptic Passage", 54, 10},
{"Cryptic BloodBath", 64, 4},
- {"Blood 2", 68, 5},
- {"Transfusion", 73, 9},
- {"Conversions", 82, 6}
+ {"Blood 2", 68, 8},
+ {"Transfusion", 76, 9},
+ {"Conversions", 85, 9}
};
level_t goodvsbad2levels[] =
{"Contrib", 7, 6},
};
+level_t defeatindetail2levels[] =
+{
+ {"atac3", "River Crossing"},
+ {"atac4", "Canyon Chaos"},
+ {"atac7", "Desert Stormer"},
+};
+
+episode_t defeatindetail2episodes[] =
+{
+ {"ATAC Campaign", 0, 3},
+};
+
gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
+gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1};
-typedef struct
+typedef struct gameinfo_s
{
- int gameid;
+ gamemode_t gameid;
gamelevels_t *notregistered;
gamelevels_t *registered;
}
{GAME_GOODVSBAD2, &goodvsbad2game, &goodvsbad2game},
{GAME_BATTLEMECH, &battlemechgame, &battlemechgame},
{GAME_OPENQUARTZ, &openquartzgame, &openquartzgame},
- {-1, &sharewarequakegame, ®isteredquakegame} // final fallback
+ {GAME_DEFEATINDETAIL2, &defeatindetail2game, &defeatindetail2game},
+ {(gamemode_t)-1, &sharewarequakegame, ®isteredquakegame} // final fallback
};
gamelevels_t *lookupgameinfo(void)
M_Background(320, 200);
- M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/p_multi.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
+ M_DrawPic (16, 4, "gfx/qplaque");
+ p = Draw_CachePic ("gfx/p_multi", false);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
M_DrawTextBox (152, 32, 10, 1);
M_Print(160, 40, "begin game");
}
M_Print(160, 72, msg);
}
-
M_Print(0, 80, " Skill");
- if (skill.integer == 0)
- M_Print(160, 80, "Easy difficulty");
- else if (skill.integer == 1)
- M_Print(160, 80, "Normal difficulty");
- else if (skill.integer == 2)
- M_Print(160, 80, "Hard difficulty");
+ if (gamemode == GAME_TRANSFUSION)
+ {
+ if (skill.integer == 1)
+ M_Print(160, 80, "Still Kicking");
+ else if (skill.integer == 2)
+ M_Print(160, 80, "Pink On The Inside");
+ else if (skill.integer == 3)
+ M_Print(160, 80, "Lightly Broiled");
+ else if (skill.integer == 4)
+ M_Print(160, 80, "Well Done");
+ else
+ M_Print(160, 80, "Extra Crispy");
+ }
else
- M_Print(160, 80, "Nightmare difficulty");
-
+ {
+ if (skill.integer == 0)
+ M_Print(160, 80, "Easy difficulty");
+ else if (skill.integer == 1)
+ M_Print(160, 80, "Normal difficulty");
+ else if (skill.integer == 2)
+ M_Print(160, 80, "Hard difficulty");
+ else
+ M_Print(160, 80, "Nightmare difficulty");
+ }
M_Print(0, 88, " Frag Limit");
if (fraglimit.integer == 0)
M_Print(160, 88, "none");
if (gamemode == GAME_GOODVSBAD2)
break;
Cvar_SetValueQuick (&skill, skill.integer + dir);
- if (skill.integer > 3)
- Cvar_SetValueQuick (&skill, 0);
- if (skill.integer < 0)
- Cvar_SetValueQuick (&skill, 3);
+ if (gamemode == GAME_TRANSFUSION)
+ {
+ if (skill.integer > 5)
+ Cvar_SetValueQuick (&skill, 1);
+ if (skill.integer < 1)
+ Cvar_SetValueQuick (&skill, 5);
+ }
+ else
+ {
+ if (skill.integer > 3)
+ Cvar_SetValueQuick (&skill, 0);
+ if (skill.integer < 0)
+ Cvar_SetValueQuick (&skill, 3);
+ }
break;
case 5:
case K_BACKSPACE:
if (gameoptions_cursor == 9)
{
- l = strlen(hostname.string);
+ l = (int)strlen(hostname.string);
if (l)
{
l = min(l - 1, 37);
break;
default:
- if (ascii < 32 || ascii > 126)
+ if (ascii < 32)
break;
if (gameoptions_cursor == 9)
{
- l = strlen(hostname.string);
+ l = (int)strlen(hostname.string);
if (l < 37)
{
memcpy(hostnamebuf, hostname.string, l);
const char *s;
// use as much vertical space as available
- M_Background(640, vid.conheight);
+ if (gamemode == GAME_TRANSFUSION)
+ M_Background(640, vid_conheight.integer - 80);
+ else
+ M_Background(640, vid_conheight.integer);
// scroll the list as the cursor moves
s = va("%i/%i masters %i/%i servers", masterreplycount, masterquerycount, serverreplycount, serverquerycount);
M_PrintRed((640 - strlen(s) * 8) / 2, 32, s);
if (*m_return_reason)
- M_Print(16, vid.conheight - 8, m_return_reason);
+ M_Print(16, menu_height - 8, m_return_reason);
y = 48;
- visible = (vid.conheight - 16 - y) / 8;
- start = bound(0, slist_cursor - (visible >> 1), hostCacheCount - visible);
- end = min(start + visible, hostCacheCount);
+ visible = (menu_height - 16 - y) / 8 / 2;
+ start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible);
+ end = min(start + visible, serverlist_viewcount);
- p = Draw_CachePic("gfx/p_multi.lmp");
- M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi.lmp");
+ p = Draw_CachePic("gfx/p_multi", false);
+ M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi");
if (end > start)
{
for (n = start;n < end;n++)
{
DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
- M_Print(0, y, hostcache[n].line1);y += 8;
- M_Print(0, y, hostcache[n].line2);y += 8;
+ M_PrintColored(0, y, serverlist_viewlist[n]->line1);y += 8;
+ M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8;
}
}
else if (realtime - masterquerytime < 3)
S_LocalSound ("sound/misc/menu1.wav");
slist_cursor--;
if (slist_cursor < 0)
- slist_cursor = hostCacheCount - 1;
+ slist_cursor = serverlist_viewcount - 1;
break;
case K_DOWNARROW:
case K_RIGHTARROW:
S_LocalSound ("sound/misc/menu1.wav");
slist_cursor++;
- if (slist_cursor >= hostCacheCount)
+ if (slist_cursor >= serverlist_viewcount)
slist_cursor = 0;
break;
case K_ENTER:
S_LocalSound ("sound/misc/menu2.wav");
- Cbuf_AddText(va("connect \"%s\"\n", hostcache[slist_cursor].cname));
+ if (serverlist_viewcount)
+ Cbuf_AddText(va("connect \"%s\"\n", serverlist_viewlist[slist_cursor]->info.cname));
break;
default:
void M_Init (void)
{
- menu_mempool = Mem_AllocPool("Menu", 0, NULL);
menuplyr_load = true;
menuplyr_pixels = NULL;
Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f);
Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f);
Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f);
- Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
Cmd_AddCommand ("menu_keys", M_Menu_Keys_f);
Cmd_AddCommand ("menu_video", M_Menu_Video_f);
Cmd_AddCommand ("menu_reset", M_Menu_Reset_f);
Cmd_AddCommand ("help", M_Menu_Help_f);
Cmd_AddCommand ("menu_quit", M_Menu_Quit_f);
+ Cmd_AddCommand ("menu_transfusion_episode", M_Menu_Transfusion_Episode_f);
+ Cmd_AddCommand ("menu_transfusion_skill", M_Menu_Transfusion_Skill_f);
+ Cmd_AddCommand ("menu_credits", M_Menu_Credits_f);
if (gamemode == GAME_TRANSFUSION)
{
M_SinglePlayer_Draw ();
break;
+ case m_transfusion_episode:
+ M_Transfusion_Episode_Draw ();
+ break;
+
+ case m_transfusion_skill:
+ M_Transfusion_Skill_Draw ();
+ break;
+
case m_load:
M_Load_Draw ();
break;
M_Help_Draw ();
break;
+ case m_credits:
+ M_Credits_Draw ();
+ break;
+
case m_quit:
M_Quit_Draw ();
break;
break;
}
+ if (gamemode == GAME_TRANSFUSION) {
+ if (m_state != m_credits) {
+ cachepic_t *p;
+ int g, scale_x, scale_y, scale_y_repeat, top_offset;
+ float scale_y_rate;
+ scale_y_repeat = vid_conheight.integer * 2;
+ g = (int)(realtime * 64)%96;
+ scale_y_rate = (float)(g+1) / 96;
+ top_offset = (g+12)/12;
+ p = Draw_CachePic (va("gfx/blooddrip%i", top_offset), false);
+ for (scale_x = 0; scale_x <= vid_conwidth.integer; scale_x += p->width) {
+ for (scale_y = -scale_y_repeat; scale_y <= vid_conheight.integer; scale_y += scale_y_repeat) {
+ DrawQ_Pic (scale_x + 21, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x + 116, scale_y_repeat + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop1", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x + 180, scale_y_repeat * .275 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x + 242, scale_y_repeat * .75 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x + 304, scale_y_repeat * .25 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x + 362, scale_y_repeat * .46125 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x + 402, scale_y_repeat * .1725 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x + 438, scale_y_repeat * .9 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop1", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x + 484, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x + 557, scale_y_repeat * .9425 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop1", 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x + 606, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop2", 0, 0, 1, 1, 1, 1, 0);
+ }
+ DrawQ_Pic (scale_x, -1, va("gfx/blooddrip%i", top_offset), 0, 0, 1, 1, 1, 1, 0);
+ }
+ }
+ }
+
if (m_entersound)
{
S_LocalSound ("sound/misc/menu2.wav");
M_SinglePlayer_Key (key, ascii);
return;
+ case m_transfusion_episode:
+ M_Transfusion_Episode_Key (key, ascii);
+ return;
+
+ case m_transfusion_skill:
+ M_Transfusion_Skill_Key (key, ascii);
+ return;
+
case m_load:
M_Load_Key (key, ascii);
return;
M_Help_Key (key, ascii);
return;
+ case m_credits:
+ M_Credits_Key (key, ascii);
+ return;
+
case m_quit:
M_Quit_Key (key, ascii);
return;
#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"
-#undef NG_MENU
+
static char *m_required_func[] = {
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 MR_SetRouting (qboolean forceold);
-void MP_Error(void)
+void MP_Error(const char *format, ...)
{
+ static qboolean processingError = false;
+ char errorstring[MAX_INPUTLINE];
+ va_list argptr;
+
+ va_start (argptr, format);
+ dpvsnprintf (errorstring, sizeof(errorstring), format, argptr);
+ va_end (argptr);
+ Con_Printf( "Menu_Error: %s\n", errorstring );
+
+ if( !processingError ) {
+ processingError = true;
+ PRVM_Crash();
+ processingError = false;
+ } else {
+ Con_Printf( "Menu_Error: Recursive call to MP_Error (from PRVM_Crash)!\n" );
+ }
+
// fall back to the normal menu
// say it
key_dest = key_game;
- //PRVM_ResetProg();
-
// init the normal menu now -> this will also correct the menu router pointers
MR_SetRouting (TRUE);
+
+ Host_AbortCurrentFrame();
}
void MP_Keydown (int key, char ascii)
*prog->time = realtime;
// pass key
- prog->globals[OFS_PARM0] = (float) key;
- prog->globals[OFS_PARM1] = (float) ascii;
+ prog->globals.generic[OFS_PARM0] = (float) key;
+ prog->globals.generic[OFS_PARM1] = (float) ascii;
PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key, float ascii) required\n");
PRVM_End;
PRVM_End;
}
+void MP_Fallback (void)
+{
+ MP_Shutdown();
+
+ key_dest = key_game;
+
+ // init the normal menu now -> this will also correct the menu router pointers
+ MR_SetRouting (TRUE);
+}
+
void MP_Init (void)
{
PRVM_Begin;
PRVM_InitProg(PRVM_MENUPROG);
- prog->crc = M_PROGHEADER_CRC;
+ prog->headercrc = M_PROGHEADER_CRC;
prog->edictprivate_size = 0; // no private struct used
prog->name = M_NAME;
+ prog->num_edicts = 1;
prog->limit_edicts = M_MAX_EDICTS;
prog->extensionstring = vm_m_extensions;
prog->builtins = vm_m_builtins;
prog->error_cmd = MP_Error;
// allocate the mempools
- prog->edicts_mempool = Mem_AllocPool(M_NAME " edicts mempool", 0, NULL);
- prog->edictstring_mempool = Mem_AllocPool( M_NAME " edict string mempool", 0, NULL);
prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL);
- PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func);
+ PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, 0, NULL);
// set m_draw and m_keydown
m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions);
void MP_Restart(void)
{
-
MP_Init();
}
static cvar_t forceqmenu = { 0, "forceqmenu", "0" };
+void (*MR_Keydown) (int key, char ascii);
+void (*MR_Draw) (void);
+void (*MR_ToggleMenu_f) (void);
+void (*MR_Shutdown) (void);
+
void MR_SetRouting(qboolean forceold)
{
static qboolean m_init = FALSE, mp_init = FALSE;
void Call_MR_ToggleMenu_f(void)
{
+ Host_StartVideo();
if(MR_ToggleMenu_f)
MR_ToggleMenu_f();
}
{
// set router console commands
Cvar_RegisterVariable (&forceqmenu);
+ Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
if (gamemode == GAME_NETHERWORLD)
- Cmd_AddCommand ("menu_fallback", MP_Error); //Force to old-style menu
+ Cmd_AddCommand ("menu_fallback", MP_Fallback); //Force to old-style menu
Cmd_AddCommand ("menu_restart",MR_Restart);
Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f);
}
// 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
+ else
MR_SetRouting (FALSE);
}
projects / xonotic / darkplaces.git / blobdiff