X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=b59b39a2c79f6bcc16c12ab95c5ad4b403e96a61;hp=b993058170650cf1a65a5f7542e706e00c9af719;hb=10d4097588b91534b5cc2c81232982c266ea8402;hpb=7403ba135fe27515470bfc6a7f8980869ccfee76 diff --git a/menu.c b/menu.c index b9930581..b59b39a2 100644 --- a/menu.c +++ b/menu.c @@ -28,9 +28,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define TYPE_GAME 2 #define TYPE_BOTH 3 -int NehGameType; +static int NehGameType; enum m_state_e m_state; +char m_return_reason[32]; void M_Menu_Main_f (void); void M_Menu_SinglePlayer_f (void); @@ -54,54 +55,51 @@ void M_Menu_LanConfig_f (void); void M_Menu_GameOptions_f (void); void M_Menu_ServerList_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_Setup_Draw (void); - void M_Options_Draw (void); - void M_Options_Effects_Draw (void); - void M_Options_Graphics_Draw (void); - void M_Options_ColorControl_Draw (void); - void M_Keys_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_ServerList_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_Setup_Key (int key, char ascii); - void M_Options_Key (int key, char ascii); - void M_Options_Effects_Key (int key, char ascii); - void M_Options_Graphics_Key (int key, char ascii); - void M_Options_ColorControl_Key (int key, char ascii); - void M_Keys_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); -void M_ServerList_Key (int key, char ascii); - -qboolean m_entersound; // play after drawing a frame, so caching - // won't disrupt the sound - -char m_return_reason [32]; +static void M_Main_Draw (void); + static void M_SinglePlayer_Draw (void); + static void M_Transfusion_Episode_Draw (void); + static void M_Transfusion_Skill_Draw (void); + static void M_Load_Draw (void); + static void M_Save_Draw (void); + static void M_MultiPlayer_Draw (void); + static void M_Setup_Draw (void); + static void M_Options_Draw (void); + static void M_Options_Effects_Draw (void); + static void M_Options_Graphics_Draw (void); + static void M_Options_ColorControl_Draw (void); + static void M_Keys_Draw (void); + static void M_Reset_Draw (void); + static void M_Video_Draw (void); + static void M_Help_Draw (void); + static void M_Credits_Draw (void); + static void M_Quit_Draw (void); +static void M_LanConfig_Draw (void); +static void M_GameOptions_Draw (void); +static void M_ServerList_Draw (void); + +static void M_Main_Key (int key, char ascii); + static void M_SinglePlayer_Key (int key, char ascii); + static void M_Transfusion_Episode_Key (int key, char ascii); + static void M_Transfusion_Skill_Key (int key, char ascii); + static void M_Load_Key (int key, char ascii); + static void M_Save_Key (int key, char ascii); + static void M_MultiPlayer_Key (int key, char ascii); + static void M_Setup_Key (int key, char ascii); + static void M_Options_Key (int key, char ascii); + static void M_Options_Effects_Key (int key, char ascii); + static void M_Options_Graphics_Key (int key, char ascii); + static void M_Options_ColorControl_Key (int key, char ascii); + static void M_Keys_Key (int key, char ascii); + static void M_Reset_Key (int key, char ascii); + static void M_Video_Key (int key, char ascii); + static void M_Help_Key (int key, char ascii); + static void M_Credits_Key (int key, char ascii); + static void M_Quit_Key (int key, char ascii); +static void M_LanConfig_Key (int key, char ascii); +static void M_GameOptions_Key (int key, char ascii); +static void M_ServerList_Key (int key, char ascii); + +static qboolean m_entersound; // play after drawing a frame, so caching won't disrupt the sound void M_Update_Return_Reason(char *s) { @@ -121,7 +119,7 @@ typedef struct nehahrademonames_s char *desc; } nehahrademonames_t; -nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] = +static nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] = { {"intro", "Prologue"}, {"genf", "The Beginning"}, @@ -159,16 +157,16 @@ nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] = {"seal", "The Seal is Broken"} }; -float menu_x, menu_y, menu_width, menu_height; +static float menu_x, menu_y, menu_width, menu_height; -void M_Background(int width, int height) +static void M_Background(int width, int height) { 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.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0); + //DrawQ_Pic(menu_x, menu_y, NULL, menu_width, menu_height, 0, 0, 0, 0.5, 0); + DrawQ_Pic(0, 0, NULL, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0); } /* @@ -178,7 +176,7 @@ M_DrawCharacter Draws one solid graphics character ================ */ -void M_DrawCharacter (float cx, float cy, int num) +static void M_DrawCharacter (float cx, float cy, int num) { char temp[2]; temp[0] = num; @@ -186,17 +184,22 @@ void M_DrawCharacter (float cx, float cy, int num) DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0); } -void M_Print(float cx, float cy, const char *str) +static 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); +} + +static 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_PrintRed (float cx, float cy, const char *str) +static void M_PrintRed(float cx, float cy, const char *str) { DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0); } -void M_ItemPrint(float cx, float cy, const char *str, int unghosted) +static 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); @@ -204,15 +207,15 @@ void M_ItemPrint(float cx, float cy, const char *str, int unghosted) 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, const char *picname) +static 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); + DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic(picname, true), 0, 0, 1, 1, 1, 1, 0); } -unsigned char identityTable[256]; -unsigned char translationTable[256]; +static unsigned char identityTable[256]; +static unsigned char translationTable[256]; -void M_BuildTranslationTable(int top, int bottom) +static void M_BuildTranslationTable(int top, int bottom) { int j; unsigned char *dest, *source; @@ -238,8 +241,7 @@ void M_BuildTranslationTable(int top, int bottom) dest[BOTTOM_RANGE+j] = source[bottom+15-j]; } - -void M_DrawTextBox (float x, float y, float width, float height) +static void M_DrawTextBox(float x, float y, float width, float height) { int n; float cx, cy; @@ -299,17 +301,23 @@ void M_ToggleMenu_f (void) m_entersound = true; if (key_dest != key_menu || m_state != m_main) + { + if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "1")) + return; M_Menu_Main_f (); + } else { + if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "0")) + return; key_dest = key_game; m_state = m_none; } } -int demo_cursor; -void M_Demo_Draw (void) +static int demo_cursor; +static void M_Demo_Draw (void) { int i; @@ -330,7 +338,8 @@ void M_Menu_Demos_f (void) m_entersound = true; } -void M_Demo_Key (int k, char ascii) + +static void M_Demo_Key (int k, char ascii) { switch (k) { @@ -366,12 +375,16 @@ void M_Demo_Key (int k, char ascii) //============================================================================= /* MAIN MENU */ -int m_main_cursor; +static int m_main_cursor; +static qboolean m_missingdata = false; + +static int MAIN_ITEMS = 4; // Nehahra: Menu Disable -int MAIN_ITEMS = 4; // Nehahra: Menu Disable void M_Menu_Main_f (void) { + const char *s; + s = "gfx/mainmenu"; if (gamemode == GAME_NEHAHRA) { if (NehGameType == TYPE_DEMO) @@ -383,7 +396,9 @@ void M_Menu_Main_f (void) } else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item MAIN_ITEMS = 6; - else if (gamemode == GAME_TRANSFUSION) { + else if (gamemode == GAME_TRANSFUSION) + { + s = "gfx/menu/mainmenu1"; if (sv.active && !cl.intermission && cl.islocalgame) MAIN_ITEMS = 8; else @@ -392,6 +407,11 @@ void M_Menu_Main_f (void) else MAIN_ITEMS = 5; + // check if the game data is missing and use a different main menu if so + m_missingdata = Draw_CachePic (s, true)->tex == r_texture_notexture; + if (m_missingdata) + MAIN_ITEMS = 2; + /* if (key_dest != key_menu) { @@ -405,36 +425,53 @@ void M_Menu_Main_f (void) } -void M_Main_Draw (void) +static void M_Main_Draw (void) { int f; cachepic_t *p; + if (m_missingdata) + { + float y; + const char *s; + M_Background(640, 480); //fall back is always to 640x480, this makes it most readable at that. + y = 480/3-16; + s = "You have reached this menu due to missing or unlocatable content/data";M_PrintRed ((640-strlen(s)*8)*0.5, (480/3)-16, s);y+=8; + y+=8; + s = "You may consider adding";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8; + s = "-basedir /path/to/game";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8; + s = "to your launch commandline";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8; + M_Print (640/2 - 48, 480/2, "Open Console"); //The console usually better shows errors (failures) + M_Print (640/2 - 48, 480/2 + 8, "Quit"); + M_DrawCharacter(640/2 - 56, 480/2 + (8 * m_main_cursor), 12+((int)(realtime*4)&1)); + return; + } + 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"); + p = Draw_CachePic ("gfx/menu/tb-transfusion", true); + M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/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)); + M_DrawPic (0, y2, va("gfx/menu/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)); + M_DrawPic (0, 120 + m_main_cursor * 40, va("gfx/menu/mainmenu%iselected", y3)); return; } M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/ttl_main", false); + p = Draw_CachePic ("gfx/ttl_main", true); M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main"); // Nehahra if (gamemode == GAME_NEHAHRA) @@ -455,7 +492,7 @@ void M_Main_Draw (void) } -void M_Main_Key (int key, char ascii) +static void M_Main_Key (int key, char ascii) { switch (key) { @@ -482,7 +519,24 @@ void M_Main_Key (int key, char ascii) case K_ENTER: m_entersound = true; - if (gamemode == GAME_NEHAHRA) + if (m_missingdata) + { + switch (m_main_cursor) + { + case 0: + if (cls.state == ca_connected) + { + m_state = m_none; + key_dest = key_game; + } + Con_ToggleConsole_f (); + break; + case 1: + M_Menu_Quit_f (); + break; + } + } + else if (gamemode == GAME_NEHAHRA) { switch (NehGameType) { @@ -700,7 +754,7 @@ void M_Main_Key (int key, char ascii) //============================================================================= /* SINGLE PLAYER MENU */ -int m_singleplayer_cursor; +static int m_singleplayer_cursor; #define SINGLEPLAYER_ITEMS 3 @@ -712,24 +766,22 @@ void M_Menu_SinglePlayer_f (void) } -void M_SinglePlayer_Draw (void) +static void M_SinglePlayer_Draw (void) { cachepic_t *p; M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/ttl_sgl", false); + p = Draw_CachePic ("gfx/ttl_sgl", true); // Some mods don't have a single player mode - if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) + if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl"); M_DrawTextBox (60, 8 * 8, 23, 4); - if (gamemode == GAME_NEXUIZ) - M_Print(95, 10 * 8, "Nexuiz is for"); - else if (gamemode == GAME_GOODVSBAD2) + if (gamemode == GAME_GOODVSBAD2) M_Print(95, 10 * 8, "Good Vs Bad 2 is for"); else // if (gamemode == GAME_BATTLEMECH) M_Print(95, 10 * 8, "Battlemech is for"); @@ -749,9 +801,9 @@ void M_SinglePlayer_Draw (void) } -void M_SinglePlayer_Key (int key, char ascii) +static void M_SinglePlayer_Key (int key, char ascii) { - if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) + if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { if (key == K_ESCAPE || key == K_ENTER) m_state = m_main; @@ -811,13 +863,13 @@ void M_SinglePlayer_Key (int key, char ascii) //============================================================================= /* LOAD/SAVE MENU */ -int load_cursor; // 0 < load_cursor < MAX_SAVEGAMES +static int load_cursor; // 0 < load_cursor < MAX_SAVEGAMES #define MAX_SAVEGAMES 12 -char m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1]; -int loadable[MAX_SAVEGAMES]; +static char m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1]; +static int loadable[MAX_SAVEGAMES]; -void M_ScanSaves (void) +static void M_ScanSaves (void) { int i, j, len; char name[MAX_OSPATH]; @@ -828,7 +880,7 @@ void M_ScanSaves (void) for (i=0 ; iwidth)/2, 4, "gfx/p_load" ); for (i=0 ; i< MAX_SAVEGAMES; i++) @@ -896,14 +948,14 @@ void M_Load_Draw (void) } -void M_Save_Draw (void) +static void M_Save_Draw (void) { int i; cachepic_t *p; M_Background(320, 200); - p = Draw_CachePic ("gfx/p_save", false); + p = Draw_CachePic ("gfx/p_save", true); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save"); for (i=0 ; iwidth/2, 40, "gfx/tb-episodes"); + p = Draw_CachePic ("gfx/menu/tb-episodes", true); + M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-episodes"); for (y = 0; y < EPISODE_ITEMS; y++){ - M_DrawPic (0, 160 + y * 40, va("gfx/episode%i", y+1)); + M_DrawPic (0, 160 + y * 40, va("gfx/menu/episode%i", y+1)); } - M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/episode%iselected", m_episode_cursor + 1)); + M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/menu/episode%iselected", m_episode_cursor + 1)); } -void M_Transfusion_Episode_Key (int key, char ascii) +static void M_Transfusion_Episode_Key (int key, char ascii) { switch (key) { @@ -1050,7 +1102,7 @@ void M_Transfusion_Episode_Key (int key, char ascii) //============================================================================= /* Transfusion Single Player Skill Menu */ -int m_skill_cursor = 2; +static int m_skill_cursor = 2; #define SKILL_ITEMS 5 void M_Menu_Transfusion_Skill_f (void) @@ -1060,23 +1112,23 @@ void M_Menu_Transfusion_Skill_f (void) key_dest = key_menu; } -void M_Transfusion_Skill_Draw (void) +static 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"); + p = Draw_CachePic ("gfx/menu/tb-difficulty", true); + M_DrawPic(640/2 - p->width/2, 40, "gfx/menu/tb-difficulty"); for (y = 0; y < SKILL_ITEMS; y++) { - M_DrawPic (0, 180 + y * 40, va("gfx/difficulty%i", y+1)); + M_DrawPic (0, 180 + y * 40, va("gfx/menu/difficulty%i", y+1)); } - M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va("gfx/difficulty%iselected", m_skill_cursor + 1)); + M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va("gfx/menu/difficulty%iselected", m_skill_cursor + 1)); } -void M_Transfusion_Skill_Key (int key, char ascii) +static void M_Transfusion_Skill_Key (int key, char ascii) { switch (key) { @@ -1150,7 +1202,7 @@ void M_Transfusion_Skill_Key (int key, char ascii) //============================================================================= /* MULTIPLAYER MENU */ -int m_multiplayer_cursor; +static int m_multiplayer_cursor; #define MULTIPLAYER_ITEMS 3 @@ -1162,7 +1214,7 @@ void M_Menu_MultiPlayer_f (void) } -void M_MultiPlayer_Draw (void) +static void M_MultiPlayer_Draw (void) { int f; cachepic_t *p; @@ -1170,17 +1222,17 @@ void M_MultiPlayer_Draw (void) 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"); + p = Draw_CachePic ("gfx/menu/tb-online", true); + M_DrawPic (640/2 - p->width/2, 140, "gfx/menu/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)); + M_DrawPic (0, 180 + f*40, va("gfx/menu/online%i", f)); + M_DrawPic (0, 220 + m_multiplayer_cursor * 40, va("gfx/menu/online%iselected", m_multiplayer_cursor + 1)); return; } M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/p_multi", false); + p = Draw_CachePic ("gfx/p_multi", true); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); M_DrawPic (72, 32, "gfx/mp_menu"); @@ -1190,7 +1242,7 @@ void M_MultiPlayer_Draw (void) } -void M_MultiPlayer_Key (int key, char ascii) +static void M_MultiPlayer_Key (int key, char ascii) { switch (key) { @@ -1229,16 +1281,16 @@ void M_MultiPlayer_Key (int key, char ascii) //============================================================================= /* SETUP MENU */ -int setup_cursor = 4; -int setup_cursor_table[] = {40, 64, 88, 124, 140}; +static int setup_cursor = 4; +static int setup_cursor_table[] = {40, 64, 88, 124, 140}; -char setup_myname[32]; -int setup_oldtop; -int setup_oldbottom; -int setup_top; -int setup_bottom; -int setup_rate; -int setup_oldrate; +static char setup_myname[32]; +static int setup_oldtop; +static int setup_oldbottom; +static int setup_top; +static int setup_bottom; +static int setup_rate; +static int setup_oldrate; #define NUM_SETUP_CMDS 5 @@ -1247,7 +1299,7 @@ void M_Menu_Setup_f (void) key_dest = key_menu; m_state = m_setup; m_entersound = true; - strcpy(setup_myname, cl_name.string); + strlcpy(setup_myname, cl_name.string, sizeof(setup_myname)); setup_top = setup_oldtop = cl_color.integer >> 4; setup_bottom = setup_oldbottom = cl_color.integer & 15; setup_rate = cl_rate.integer; @@ -1290,7 +1342,7 @@ static int setup_rateindex(int rate) return bound(1, i, RATES) - 1; } -void M_Setup_Draw (void) +static void M_Setup_Draw (void) { int i; cachepic_t *p; @@ -1298,12 +1350,12 @@ void M_Setup_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/p_multi", false); + p = Draw_CachePic ("gfx/p_multi", true); 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) { @@ -1331,8 +1383,8 @@ void M_Setup_Draw (void) menuplyr_width = image_width; menuplyr_height = image_height; Mem_Free(f); - 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); + menuplyr_pixels = (unsigned char *)Mem_Alloc(cls.permanentmempool, menuplyr_width * menuplyr_height); + menuplyr_translated = (unsigned int *)Mem_Alloc(cls.permanentmempool, menuplyr_width * menuplyr_height * 4); memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height); Mem_Free(data); } @@ -1346,7 +1398,7 @@ void M_Setup_Draw (void) menuplyr_bottom = setup_bottom; 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]]]; + menuplyr_translated[i] = palette_transparent[translationTable[menuplyr_pixels[i]]]; Draw_NewPic("gfx/menuplyr", menuplyr_width, menuplyr_height, true, (unsigned char *)menuplyr_translated); } M_DrawPic(160, 48, "gfx/bigbox"); @@ -1360,7 +1412,7 @@ void M_Setup_Draw (void) } -void M_Setup_Key (int k, char ascii) +static void M_Setup_Key (int k, char ascii) { int l; @@ -1446,7 +1498,7 @@ forward: break; default: - if (ascii < 32 || ascii > 126) + if (ascii < 32) break; if (setup_cursor == 0) { @@ -1474,7 +1526,7 @@ forward: #define SLIDER_RANGE 10 -void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax) +static void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax) { char text[16]; int i; @@ -1492,7 +1544,7 @@ void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax) M_Print(x + (SLIDER_RANGE+2) * 8, y, text); } -void M_DrawCheckbox (int x, int y, int on) +static void M_DrawCheckbox (int x, int y, int on) { if (on) M_Print(x, y, "on"); @@ -1503,7 +1555,7 @@ void M_DrawCheckbox (int x, int y, int on) #define OPTIONS_ITEMS 39 -int options_cursor; +static int options_cursor; void M_Menu_Options_f (void) { @@ -1517,7 +1569,7 @@ extern dllhandle_t jpeg_dll; extern cvar_t gl_texture_anisotropy; extern cvar_t r_textshadow; -void M_Menu_Options_AdjustSliders (int dir) +static void M_Menu_Options_AdjustSliders (int dir) { int optnum; S_LocalSound ("sound/misc/menu3.wav"); @@ -1527,8 +1579,6 @@ void M_Menu_Options_AdjustSliders (int dir) Cvar_SetValueQuick (&vid_conwidth, bound(320, vid_conwidth.value + dir * 64, 2048)); else if (options_cursor == optnum++) Cvar_SetValueQuick (&vid_conheight, bound(240, vid_conheight.value + dir * 48, 1536)); - else if (options_cursor == optnum++) - Cvar_SetValueQuick (&scr_conspeed, bound(0, scr_conspeed.value + dir * 100, 1000)); else if (options_cursor == optnum++) Cvar_SetValueQuick (&scr_conalpha, bound(0, scr_conalpha.value + dir * 0.2, 1)); else if (options_cursor == optnum++) @@ -1545,6 +1595,8 @@ void M_Menu_Options_AdjustSliders (int dir) Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer); 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 (&scr_screenshot_gammaboost, bound(0.1, scr_screenshot_gammaboost.value + dir * 0.1, 4)); else if (options_cursor == optnum++) Cvar_SetValueQuick (&r_sky, !r_sky.integer); else if (options_cursor == optnum++) @@ -1565,8 +1617,6 @@ void M_Menu_Options_AdjustSliders (int dir) 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++) - Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer); else if (options_cursor == optnum++) Cvar_SetValueQuick (&showfps, !showfps.integer); else if (options_cursor == optnum++) @@ -1600,26 +1650,26 @@ void M_Menu_Options_AdjustSliders (int dir) Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer); } -int optnum; -int opty; -int optcursor; +static int optnum; +static int opty; +static int optcursor; -void M_Options_PrintCommand(const char *s, int enabled) +static void M_Options_PrintCommand(const char *s, int enabled) { 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); + DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); M_ItemPrint(0, opty, s, enabled); } opty += 8; optnum++; } -void M_Options_PrintCheckbox(const char *s, int enabled, int yes) +static 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); + DrawQ_Pic(menu_x, menu_y + opty, NULL, 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 + (int)strlen(s) * 8 + 8, opty, yes); } @@ -1627,11 +1677,11 @@ void M_Options_PrintCheckbox(const char *s, int enabled, int yes) optnum++; } -void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue) +static 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); + DrawQ_Pic(menu_x, menu_y + opty, NULL, 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 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue); } @@ -1639,7 +1689,7 @@ void M_Options_PrintSlider(const char *s, int enabled, float value, float minval optnum++; } -void M_Options_Draw (void) +static void M_Options_Draw (void) { int visible; cachepic_t *p; @@ -1647,12 +1697,12 @@ void M_Options_Draw (void) M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer)); M_DrawPic(16, 4, "gfx/qplaque"); - p = Draw_CachePic("gfx/p_option", false); + p = Draw_CachePic("gfx/p_option", true); M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optnum = 0; optcursor = options_cursor; - visible = (menu_height - 32) / 8; + visible = (int)((menu_height - 32) / 8); opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8; M_Options_PrintCommand( "Customize controls", true); @@ -1664,7 +1714,6 @@ void M_Options_Draw (void) M_Options_PrintCommand( " Color Control", true); M_Options_PrintSlider( " 2D Screen Width ", true, vid_conwidth.value, 320, 2048); M_Options_PrintSlider( " 2D Screen Height", true, vid_conheight.value, 240, 1536); - M_Options_PrintSlider( " Console Speed", true, scr_conspeed.value, 0, 1000); M_Options_PrintSlider( " Console Alpha", true, scr_conalpha.value, 0, 1); M_Options_PrintSlider( "Conback Brightness", true, scr_conbrightness.value, 0, 1); M_Options_PrintSlider( " Sbar Alpha BG", true, sbar_alpha_bg.value, 0, 1); @@ -1673,6 +1722,7 @@ void M_Options_Draw (void) 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_gammaboost.value, 0.1, 4); M_Options_PrintCheckbox(" Sky", true, r_sky.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); @@ -1683,7 +1733,6 @@ void M_Options_Draw (void) M_Options_PrintCheckbox(" Text Shadow", true, r_textshadow.integer); M_Options_PrintSlider( " Crosshair", true, crosshair.value, 0, 5); M_Options_PrintSlider( " Crosshair Size", true, crosshair_size.value, 1, 5); - M_Options_PrintCheckbox(" Static Crosshair", true, crosshair_static.integer); M_Options_PrintCheckbox(" Show Framerate", true, showfps.integer); M_Options_PrintCheckbox(" Show Time", true, showtime.integer); M_Options_PrintCheckbox(" Show Date", true, showdate.integer); @@ -1697,7 +1746,7 @@ void M_Options_Draw (void) } -void M_Options_Key (int k, char ascii) +static void M_Options_Key (int k, char ascii) { switch (k) { @@ -1762,9 +1811,9 @@ void M_Options_Key (int k, char ascii) } } -#define OPTIONS_EFFECTS_ITEMS 34 +#define OPTIONS_EFFECTS_ITEMS 36 -int options_effects_cursor; +static int options_effects_cursor; void M_Menu_Options_Effects_f (void) { @@ -1779,8 +1828,9 @@ extern cvar_t cl_stainmaps_clearonload; extern cvar_t r_explosionclip; extern cvar_t r_coronas; extern cvar_t gl_flashblend; -extern cvar_t cl_beams_polygon; -extern cvar_t cl_beams_relative; +extern cvar_t cl_beams_polygons; +extern cvar_t cl_beams_quakepositionhack; +extern cvar_t cl_beams_instantaimhack; extern cvar_t cl_beams_lightatend; extern cvar_t r_lightningbeam_thickness; extern cvar_t r_lightningbeam_scroll; @@ -1790,7 +1840,7 @@ extern cvar_t r_lightningbeam_color_green; extern cvar_t r_lightningbeam_color_blue; extern cvar_t r_lightningbeam_qmbtexture; -void M_Menu_Options_Effects_AdjustSliders (int dir) +static void M_Menu_Options_Effects_AdjustSliders (int dir) { int optnum; S_LocalSound ("sound/misc/menu3.wav"); @@ -1799,6 +1849,7 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) 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); @@ -1813,7 +1864,8 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1)); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_polygons, !cl_beams_polygons.integer); - else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_relative, !cl_beams_relative.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_instantaimhack, !cl_beams_instantaimhack.integer); + else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_quakepositionhack, !cl_beams_quakepositionhack.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_lightatend, !cl_beams_lightatend.integer); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_thickness, bound(1, r_lightningbeam_thickness.integer + dir, 10)); else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_scroll, bound(0, r_lightningbeam_scroll.integer + dir, 10)); @@ -1832,7 +1884,7 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10)); } -void M_Options_Effects_Draw (void) +static void M_Options_Effects_Draw (void) { int visible; cachepic_t *p; @@ -1840,17 +1892,18 @@ void M_Options_Effects_Draw (void) M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer)); M_DrawPic(16, 4, "gfx/qplaque"); - p = Draw_CachePic("gfx/p_option", false); + p = Draw_CachePic("gfx/p_option", true); M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_effects_cursor; optnum = 0; - visible = (menu_height - 32) / 8; + visible = (int)((menu_height - 32) / 8); opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 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); @@ -1864,8 +1917,9 @@ void M_Options_Effects_Draw (void) M_Options_PrintCheckbox(" Blood", true, cl_particles_blood.integer); M_Options_PrintSlider( " Blood Opacity", true, cl_particles_blood_alpha.value, 0.2, 1); M_Options_PrintCheckbox("Force New Blood Effect", true, cl_particles_blood_bloodhack.integer); - M_Options_PrintCheckbox(" Lightning Polygons", true, cl_beams_polygons.integer); - M_Options_PrintCheckbox("Lightning Smooth Sweep", true, cl_beams_relative.integer); + M_Options_PrintCheckbox(" Polygon Lightning", true, cl_beams_polygons.integer); + M_Options_PrintCheckbox("Smooth Sweep Lightning", true, cl_beams_instantaimhack.integer); + M_Options_PrintCheckbox(" Waist-level Lightning", true, cl_beams_quakepositionhack.integer); M_Options_PrintCheckbox(" Lightning End Light", true, cl_beams_lightatend.integer); M_Options_PrintSlider( " Lightning Thickness", cl_beams_polygons.integer, r_lightningbeam_thickness.integer, 1, 10); M_Options_PrintSlider( " Lightning Scroll", cl_beams_polygons.integer, r_lightningbeam_scroll.integer, 0, 10); @@ -1885,7 +1939,7 @@ void M_Options_Effects_Draw (void) } -void M_Options_Effects_Key (int k, char ascii) +static void M_Options_Effects_Key (int k, char ascii) { switch (k) { @@ -1922,9 +1976,9 @@ void M_Options_Effects_Key (int k, char ascii) } -#define OPTIONS_GRAPHICS_ITEMS 14 +#define OPTIONS_GRAPHICS_ITEMS 18 -int options_graphics_cursor; +static int options_graphics_cursor; void M_Menu_Options_Graphics_f (void) { @@ -1945,9 +1999,13 @@ 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 r_hdr; +extern cvar_t r_hdr_bloomintensity; +extern cvar_t r_hdr_scenebrightness; +extern cvar_t r_hdr_glowintensity; extern cvar_t gl_picmip; -void M_Menu_Options_Graphics_AdjustSliders (int dir) +static void M_Menu_Options_Graphics_AdjustSliders (int dir) { int optnum; S_LocalSound ("sound/misc/menu3.wav"); @@ -1962,16 +2020,20 @@ void M_Menu_Options_Graphics_AdjustSliders (int dir) 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_hdr, !r_hdr.integer); + else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_bloomintensity, bound(0.125, r_hdr_bloomintensity.value + dir * 0.125, 4)); + else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_glowintensity, bound(0, r_hdr_glowintensity.value + dir * 0.25, 4)); 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_intensity, bound(1, r_bloom_intensity.value + dir * 0.25, 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 (&r_hdr_scenebrightness, bound(0.25, r_hdr_scenebrightness.value + dir * 0.125, 4)); 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"); } -void M_Options_Graphics_Draw (void) +static void M_Options_Graphics_Draw (void) { int visible; cachepic_t *p; @@ -1979,12 +2041,12 @@ void M_Options_Graphics_Draw (void) M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer)); M_DrawPic(16, 4, "gfx/qplaque"); - p = Draw_CachePic("gfx/p_option", false); + p = Draw_CachePic("gfx/p_option", true); M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_graphics_cursor; optnum = 0; - visible = (menu_height - 32) / 8; + visible = (int)((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); @@ -1994,17 +2056,21 @@ void M_Options_Graphics_Draw (void) 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_PrintCheckbox(" Bloom Effect", !r_hdr.integer, r_bloom.integer); + M_Options_PrintCheckbox(" HDR Bloom Effect", r_hdr.integer, r_hdr.integer); + M_Options_PrintSlider( " HDR Bloom Intensity", r_hdr.integer, r_hdr_bloomintensity.value, 0.125, 4); + M_Options_PrintSlider( " HDR Glow Intensity", r_hdr.integer, r_hdr_glowintensity.value, 0, 4); + M_Options_PrintSlider( "Non-HDR Bloom Darkening", !r_hdr.integer && r_bloom.integer, r_bloom_power.value, 1, 16); + M_Options_PrintSlider( " Bloom Intensity", r_hdr.integer || r_bloom.integer, r_bloom_intensity.value, 1, 16); + M_Options_PrintSlider( " Bloom Blur", r_hdr.integer || r_bloom.integer, r_bloom_blur.value, 1, 16); + M_Options_PrintSlider( " Bloom Resolution", r_hdr.integer || r_bloom.integer, r_bloom_resolution.value, 64, 2048); + M_Options_PrintSlider( " Scene Brightness", true, r_hdr_scenebrightness.value, 0.25, 4); M_Options_PrintSlider( " Texture Quality", true, gl_picmip.value, 3, 0); M_Options_PrintCommand( " Restart Renderer", true); } -void M_Options_Graphics_Key (int k, char ascii) +static void M_Options_Graphics_Key (int k, char ascii) { switch (k) { @@ -2043,10 +2109,10 @@ void M_Options_Graphics_Key (int k, char ascii) #define OPTIONS_COLORCONTROL_ITEMS 18 -int options_colorcontrol_cursor; +static int options_colorcontrol_cursor; // intensity value to match up to 50% dither to 'correct' quake -cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25"}; +static cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.5", "intensity value that matches up to white/black dither pattern, should be 0.5 for linear color"}; void M_Menu_Options_ColorControl_f (void) { @@ -2056,7 +2122,7 @@ void M_Menu_Options_ColorControl_f (void) } -void M_Menu_Options_ColorControl_AdjustSliders (int dir) +static void M_Menu_Options_ColorControl_AdjustSliders (int dir) { int optnum; float f; @@ -2155,21 +2221,23 @@ void M_Menu_Options_ColorControl_AdjustSliders (int dir) } } -void M_Options_ColorControl_Draw (void) +static void M_Options_ColorControl_Draw (void) { int visible; float x, c, s, t, u, v; - cachepic_t *p; + cachepic_t *p, *dither; + + dither = Draw_CachePic("gfx/colorcontrol/ditherpattern", true); M_Background(320, 256); M_DrawPic(16, 4, "gfx/qplaque"); - p = Draw_CachePic("gfx/p_option", false); + p = Draw_CachePic("gfx/p_option", true); M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_colorcontrol_cursor; optnum = 0; - visible = (menu_height - 32) / 8; + visible = (int)((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); @@ -2192,17 +2260,17 @@ void M_Options_ColorControl_Draw (void) M_Options_PrintSlider( " White: Grey ", v_color_enable.integer, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3, 1, 5); opty += 4; - DrawQ_Fill(menu_x, menu_y + opty, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);opty += 4; + DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 4 + 64 + 8 + 64 + 4, 0, 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", 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", 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", 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; + DrawQ_SuperPic(menu_x + 4, menu_y + opty, dither, 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, dither, 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, dither, 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, dither, 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.width / vid_conwidth.integer; @@ -2211,25 +2279,25 @@ void M_Options_ColorControl_Draw (void) 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", 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); + DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, c, 0, 0, 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 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, dither, 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", 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); + DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, 0, c, 0, 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 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, dither, 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", 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); + DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, 0, 0, c, 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 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, dither, 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", 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); + DrawQ_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, c, c, c, 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 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, dither, 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); } -void M_Options_ColorControl_Key (int k, char ascii) +static void M_Options_ColorControl_Key (int k, char ascii) { switch (k) { @@ -2291,7 +2359,7 @@ void M_Options_ColorControl_Key (int k, char ascii) //============================================================================= /* KEYS MENU */ -char *quakebindnames[][2] = +static char *quakebindnames[][2] = { {"+attack", "attack"}, {"impulse 10", "next weapon"}, @@ -2314,7 +2382,7 @@ char *quakebindnames[][2] = {"+movedown", "swim down"} }; -char *transfusionbindnames[][2] = +static char *transfusionbindnames[][2] = { {"", "Movement"}, // Movement commands {"+forward", "walk forward"}, @@ -2372,7 +2440,7 @@ char *transfusionbindnames[][2] = {"impulse 79", "taunt 9"} }; -char *goodvsbad2bindnames[][2] = +static char *goodvsbad2bindnames[][2] = { {"impulse 69", "Power 1"}, {"impulse 70", "Power 2"}, @@ -2395,8 +2463,8 @@ char *goodvsbad2bindnames[][2] = {"+movedown", "swim down"} }; -int numcommands; -char *(*bindnames)[2]; +static int numcommands; +static char *(*bindnames)[2]; /* typedef struct binditem_s @@ -2414,9 +2482,9 @@ typedef struct bindcategory_s } bindcategory_t; -bindcategory_t *bindcategories = NULL; +static bindcategory_t *bindcategories = NULL; -void M_ClearBinds (void) +static void M_ClearBinds (void) { for (c = bindcategories;c;c = cnext) { @@ -2431,7 +2499,7 @@ void M_ClearBinds (void) bindcategories = NULL; } -void M_AddBindToCategory(bindcategory_t *c, char *command, char *description) +static void M_AddBindToCategory(bindcategory_t *c, char *command, char *description) { for (b = &c->binds;*b;*b = &(*b)->next); *b = Z_Alloc(sizeof(binditem_t) + strlen(command) + 1 + strlen(description) + 1); @@ -2441,7 +2509,7 @@ void M_AddBindToCategory(bindcategory_t *c, char *command, char *description) strcpy(*b->description, description); } -void M_AddBind (char *category, char *command, char *description) +static void M_AddBind (char *category, char *command, char *description) { for (c = &bindcategories;*c;c = &(*c)->next) { @@ -2455,7 +2523,7 @@ void M_AddBind (char *category, char *command, char *description) M_AddBindToCategory(*c, command, description); } -void M_DefaultBinds (void) +static void M_DefaultBinds (void) { M_ClearBinds(); M_AddBind("movement", "+jump", "jump / swim up"); @@ -2489,8 +2557,8 @@ void M_DefaultBinds (void) */ -int keys_cursor; -int bind_grab; +static int keys_cursor; +static int bind_grab; void M_Menu_Keys_f (void) { @@ -2526,7 +2594,7 @@ void M_FindKeysForCommand (const char *command, int *keys) } } -void M_UnbindCommand (char *command) +static void M_UnbindCommand (char *command) { int j; char *b; @@ -2542,7 +2610,7 @@ void M_UnbindCommand (char *command) } -void M_Keys_Draw (void) +static void M_Keys_Draw (void) { int i, j; int keys[NUMKEYS]; @@ -2552,7 +2620,7 @@ void M_Keys_Draw (void) M_Background(320, 48 + 8 * numcommands); - p = Draw_CachePic ("gfx/ttl_cstm", false); + p = Draw_CachePic ("gfx/ttl_cstm", true); M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm"); if (bind_grab) @@ -2579,7 +2647,7 @@ void M_Keys_Draw (void) // LordHavoc: redesigned to print more than 2 keys, inspired by Tomaz's MiniRacer if (keys[0] == -1) - strcpy(keystring, "???"); + strlcpy(keystring, "???", sizeof(keystring)); else { keystring[0] = 0; @@ -2588,8 +2656,8 @@ void M_Keys_Draw (void) if (keys[j] != -1) { if (j > 0) - strcat(keystring, " or "); - strcat(keystring, Key_KeynumToString (keys[j])); + strlcat(keystring, " or ", sizeof(keystring)); + strlcat(keystring, Key_KeynumToString (keys[j]), sizeof(keystring)); } } } @@ -2603,7 +2671,7 @@ void M_Keys_Draw (void) } -void M_Keys_Key (int k, char ascii) +static void M_Keys_Key (int k, char ascii) { char cmd[80]; int keys[NUMKEYS]; @@ -2679,13 +2747,13 @@ void M_Menu_Reset_f (void) } -void M_Reset_Key (int key, char ascii) +static void M_Reset_Key (int key, char ascii) { switch (key) { case 'Y': case 'y': - Cbuf_AddText ("exec default.cfg\n"); + Cbuf_AddText ("cvar_resettodefaults_all;exec default.cfg\n"); // no break here since we also exit the menu case K_ESCAPE: @@ -2700,7 +2768,7 @@ void M_Reset_Key (int key, char ascii) } } -void M_Reset_Draw (void) +static void M_Reset_Draw (void) { int lines = 2, linelength = 20; M_Background(linelength * 8 + 16, lines * 8 + 16); @@ -2712,127 +2780,223 @@ void M_Reset_Draw (void) //============================================================================= /* VIDEO MENU */ -#define VIDEO_ITEMS 5 - -int video_cursor = 0; -int video_cursor_table[] = {56, 68, 80, 100, 130}; -// 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 +// 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" , 1400,1050, 640, 480, 1 }, +{"Standard 4x3" , 1600,1200, 640, 480, 1 }, +{"Standard 4x3" , 1792,1344, 640, 480, 1 }, +{"Standard 4x3" , 1856,1392, 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" , 720, 450, 720, 450, 1 }, +{"WideScreen 8x5" , 840, 525, 640, 400, 1 }, +{"WideScreen 8x5" , 960, 600, 640, 400, 1 }, +{"WideScreen 8x5" , 1280, 800, 640, 400, 1 }, +{"WideScreen 8x5" , 1440, 900, 720, 450, 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, 720, 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) -int video_resolution; +#define VIDEO_ITEMS 7 +static int video_cursor = 0; +static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162}; +static int video_resolution; 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] == vid.width && - video_resolutions[video_resolution][1] == 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) +static void M_Video_Draw (void) { cachepic_t *p; - const char* string; M_Background(320, 200); M_DrawPic(16, 4, "gfx/qplaque"); - p = Draw_CachePic("gfx/vidmodes", false); + p = Draw_CachePic("gfx/vidmodes", true); 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)); } -void M_Menu_Video_AdjustSliders (int dir) +static void M_Menu_Video_AdjustSliders (int dir) { S_LocalSound ("sound/misc/menu3.wav"); 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; } } -void M_Video_Key (int key, char ascii) +static void M_Video_Key (int key, char ascii) { switch (key) { case K_ESCAPE: // vid_shared.c has a copy of the current video config. We restore it Cvar_SetValueQuick(&vid_fullscreen, vid.fullscreen); - Cvar_SetValueQuick(&vid_width, vid.width); - Cvar_SetValueQuick(&vid_height, vid.height); 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 (); @@ -2842,7 +3006,12 @@ void M_Video_Key (int key, char ascii) 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; @@ -2878,7 +3047,7 @@ void M_Video_Key (int key, char ascii) //============================================================================= /* HELP MENU */ -int help_page; +static int help_page; #define NUM_HELP_PAGES 6 @@ -2892,14 +3061,14 @@ void M_Menu_Help_f (void) -void M_Help_Draw (void) +static void M_Help_Draw (void) { M_Background(320, 200); M_DrawPic (0, 0, va("gfx/help%i", help_page)); } -void M_Help_Key (int key, char ascii) +static void M_Help_Key (int key, char ascii) { switch (key) { @@ -2936,17 +3105,17 @@ void M_Menu_Credits_f (void) -void M_Credits_Draw (void) +static void M_Credits_Draw (void) { M_Background(640, 480); - DrawQ_Pic (0, 0, "gfx/creditsmiddle", 0, 0, 1, 1, 1, 1, 0); + M_DrawPic (0, 0, "gfx/creditsmiddle"); 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); + M_DrawPic (0, 0, "gfx/creditstop"); + M_DrawPic (0, 433, "gfx/creditsbottom"); } -void M_Credits_Key (int key, char ascii) +static void M_Credits_Key (int key, char ascii) { M_Menu_Main_f (); } @@ -2954,12 +3123,12 @@ void M_Credits_Key (int key, char ascii) //============================================================================= /* QUIT MENU */ -char *m_quit_message[9]; -int m_quit_prevstate; -qboolean wasInMenus; +static char *m_quit_message[9]; +static int m_quit_prevstate; +static qboolean wasInMenus; -int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8) +static int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8) { m_quit_message[0] = line1; m_quit_message[1] = line2; @@ -2973,8 +3142,14 @@ int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line return 1; } -int M_ChooseQuitMessage(int request) +static int M_ChooseQuitMessage(int request) { + if (m_missingdata) + { + // frag related quit messages are pointless for a fallback menu, so use something generic + if (request-- == 0) return M_QuitMessage("Are you sure you want to quit?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL); + return 0; + } switch (gamemode) { case GAME_NORMAL: @@ -3041,13 +3216,13 @@ void M_Menu_Quit_f (void) m_state = m_quit; m_entersound = true; // count how many there are - for (n = 0;M_ChooseQuitMessage(n);n++); + for (n = 1;M_ChooseQuitMessage(n);n++); // choose one M_ChooseQuitMessage(rand() % n); } -void M_Quit_Key (int key, char ascii) +static void M_Quit_Key (int key, char ascii) { switch (key) { @@ -3076,7 +3251,7 @@ void M_Quit_Key (int key, char ascii) } } -void M_Quit_Draw (void) +static void M_Quit_Draw (void) { int i, l, linelength, firstline, lastline, lines; for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_quit_message[i];i++) @@ -3093,7 +3268,8 @@ void M_Quit_Draw (void) } lines = (lastline - firstline) + 1; M_Background(linelength * 8 + 16, lines * 8 + 16); - M_DrawTextBox(0, 0, linelength, lines); + if (!m_missingdata) //since this is a fallback menu for missing data, it is very hard to read with the box + M_DrawTextBox(0, 0, linelength, lines); //this is less obtrusive than hacking up the M_DrawTextBox function for (i = 0, l = firstline;i < lines;i++, l++) M_Print(8 + 4 * (linelength - strlen(m_quit_message[l])), 8 + 8 * i, m_quit_message[l]); } @@ -3101,13 +3277,13 @@ void M_Quit_Draw (void) //============================================================================= /* LAN CONFIG MENU */ -int lanConfig_cursor = -1; -int lanConfig_cursor_table [] = {56, 76, 112}; -#define NUM_LANCONFIG_CMDS 3 +static int lanConfig_cursor = -1; +static int lanConfig_cursor_table [] = {56, 76, 84, 120}; +#define NUM_LANCONFIG_CMDS 4 -int lanConfig_port; -char lanConfig_portname[6]; -char lanConfig_joinname[22]; +static int lanConfig_port; +static char lanConfig_portname[6]; +static char lanConfig_joinname[22]; void M_Menu_LanConfig_f (void) { @@ -3122,13 +3298,13 @@ void M_Menu_LanConfig_f (void) if (StartingGame) lanConfig_cursor = 1; lanConfig_port = 26000; - sprintf(lanConfig_portname, "%u", lanConfig_port); + sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port); M_Update_Return_Reason(""); } -void M_LanConfig_Draw (void) +static void M_LanConfig_Draw (void) { cachepic_t *p; int basex; @@ -3138,7 +3314,7 @@ void M_LanConfig_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/p_multi", false); + p = Draw_CachePic ("gfx/p_multi", true); basex = (320-p->width)/2; M_DrawPic (basex, 4, "gfx/p_multi"); @@ -3156,10 +3332,11 @@ void M_LanConfig_Draw (void) if (JoiningGame) { - M_Print(basex, lanConfig_cursor_table[1], "Search for games..."); - M_Print(basex, lanConfig_cursor_table[2]-16, "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[1], "Search for DarkPlaces games..."); + M_Print(basex, lanConfig_cursor_table[2], "Search for QuakeWorld games..."); + M_Print(basex, lanConfig_cursor_table[3]-16, "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 { @@ -3170,17 +3347,17 @@ void M_LanConfig_Draw (void) M_DrawCharacter (basex-8, lanConfig_cursor_table [lanConfig_cursor], 12+((int)(realtime*4)&1)); if (lanConfig_cursor == 0) - M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [0], 10+((int)(realtime*4)&1)); + M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [lanConfig_cursor], 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 [lanConfig_cursor], 10+((int)(realtime*4)&1)); if (*m_return_reason) M_Print(basex, 168, m_return_reason); } -void M_LanConfig_Key (int key, char ascii) +static void M_LanConfig_Key (int key, char ascii) { int l; @@ -3195,6 +3372,9 @@ void M_LanConfig_Key (int key, char ascii) lanConfig_cursor--; if (lanConfig_cursor < 0) lanConfig_cursor = NUM_LANCONFIG_CMDS-1; + // when in start game menu, skip the unused search qw servers item + if (StartingGame && lanConfig_cursor == 2) + lanConfig_cursor = 1; break; case K_DOWNARROW: @@ -3202,6 +3382,9 @@ void M_LanConfig_Key (int key, char ascii) lanConfig_cursor++; if (lanConfig_cursor >= NUM_LANCONFIG_CMDS) lanConfig_cursor = 0; + // when in start game menu, skip the unused search qw servers item + if (StartingGame && lanConfig_cursor == 1) + lanConfig_cursor = 2; break; case K_ENTER: @@ -3214,7 +3397,7 @@ void M_LanConfig_Key (int key, char ascii) Cvar_SetValue("port", lanConfig_port); - if (lanConfig_cursor == 1) + if (lanConfig_cursor == 1 || lanConfig_cursor == 2) { if (StartingGame) { @@ -3225,7 +3408,7 @@ void M_LanConfig_Key (int key, char ascii) break; } - if (lanConfig_cursor == 2) + if (lanConfig_cursor == 3) Cbuf_AddText ( va ("connect \"%s\"\n", lanConfig_joinname) ); break; @@ -3236,7 +3419,7 @@ void M_LanConfig_Key (int key, char ascii) 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; @@ -3244,10 +3427,10 @@ void M_LanConfig_Key (int key, char ascii) break; default: - if (ascii < 32 || ascii > 126) + if (ascii < 32) break; - if (lanConfig_cursor == 2) + if (lanConfig_cursor == 3) { l = (int)strlen(lanConfig_joinname); if (l < 21) @@ -3270,7 +3453,7 @@ void M_LanConfig_Key (int key, char ascii) } } - if (StartingGame && lanConfig_cursor == 2) + if (StartingGame && lanConfig_cursor == 3) { if (key == K_UPARROW) lanConfig_cursor = 1; @@ -3281,7 +3464,7 @@ void M_LanConfig_Key (int key, char ascii) l = atoi(lanConfig_portname); if (l <= 65535) lanConfig_port = l; - sprintf(lanConfig_portname, "%u", lanConfig_port); + sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port); } //============================================================================= @@ -3309,7 +3492,7 @@ typedef struct gamelevels_s } gamelevels_t; -level_t quakelevels[] = +static level_t quakelevels[] = { {"start", "Entrance"}, // 0 @@ -3357,7 +3540,7 @@ level_t quakelevels[] = {"dm6", "The Dark Zone"} }; -episode_t quakeepisodes[] = +static episode_t quakeepisodes[] = { {"Welcome to Quake", 0, 1}, {"Doomed Dimension", 1, 8}, @@ -3369,7 +3552,7 @@ episode_t quakeepisodes[] = }; //MED 01/06/97 added hipnotic levels -level_t hipnoticlevels[] = +static level_t hipnoticlevels[] = { {"start", "Command HQ"}, // 0 @@ -3397,7 +3580,7 @@ level_t hipnoticlevels[] = }; //MED 01/06/97 added hipnotic episodes -episode_t hipnoticepisodes[] = +static episode_t hipnoticepisodes[] = { {"Scourge of Armagon", 0, 1}, {"Fortress of the Dead", 1, 5}, @@ -3409,7 +3592,7 @@ episode_t hipnoticepisodes[] = //PGM 01/07/97 added rogue levels //PGM 03/02/97 added dmatch level -level_t roguelevels[] = +static level_t roguelevels[] = { {"start", "Split Decision"}, {"r1m1", "Deviant's Domain"}, @@ -3432,7 +3615,7 @@ level_t roguelevels[] = //PGM 01/07/97 added rogue episodes //PGM 03/02/97 added dmatch episode -episode_t rogueepisodes[] = +static episode_t rogueepisodes[] = { {"Introduction", 0, 1}, {"Hell's Fortress", 1, 7}, @@ -3440,7 +3623,7 @@ episode_t rogueepisodes[] = {"Deathmatch Arena", 16, 1} }; -level_t nehahralevels[] = +static level_t nehahralevels[] = { {"nehstart", "Welcome to Nehahra"}, {"neh1m1", "Forge City1: Slipgates"}, @@ -3463,7 +3646,7 @@ level_t nehahralevels[] = {"nehend", "Quintessence"} }; -episode_t nehahraepisodes[] = +static episode_t nehahraepisodes[] = { {"Welcome to Nehahra", 0, 1}, {"The Fall of Forge", 1, 9}, @@ -3472,7 +3655,7 @@ episode_t nehahraepisodes[] = }; // Map list for Transfusion -level_t transfusionlevels[] = +static level_t transfusionlevels[] = { {"e1m1", "Cradle to Grave"}, {"e1m2", "Wrong Side of the Tracks"}, @@ -3580,7 +3763,7 @@ level_t transfusionlevels[] = {"simple", "Dead Simple"} }; -episode_t transfusionepisodes[] = +static episode_t transfusionepisodes[] = { {"The Way of All Flesh", 0, 8}, {"Even Death May Die", 8, 9}, @@ -3595,7 +3778,7 @@ episode_t transfusionepisodes[] = {"Conversions", 85, 9} }; -level_t goodvsbad2levels[] = +static level_t goodvsbad2levels[] = { {"rts", "Many Paths"}, // 0 {"chess", "Chess, Scott Hess"}, // 1 @@ -3608,12 +3791,12 @@ level_t goodvsbad2levels[] = {"island", "Adventure Islands"}, }; -episode_t goodvsbad2episodes[] = +static episode_t goodvsbad2episodes[] = { {"Levels? Bevels!", 0, 8}, }; -level_t battlemechlevels[] = +static level_t battlemechlevels[] = { {"start", "Parking Level"}, {"dm1", "Hot Dump"}, // 1 @@ -3624,12 +3807,12 @@ level_t battlemechlevels[] = {"dm6", "Army go Underground"}, }; -episode_t battlemechepisodes[] = +static episode_t battlemechepisodes[] = { {"Time for Battle", 0, 7}, }; -level_t openquartzlevels[] = +static level_t openquartzlevels[] = { {"start", "Welcome to Openquartz"}, @@ -3648,35 +3831,49 @@ level_t openquartzlevels[] = {"am1", "The nameless chambers"}, }; -episode_t openquartzepisodes[] = +static episode_t openquartzepisodes[] = { {"Single Player", 0, 1}, {"Void Deathmatch", 1, 6}, {"Contrib", 7, 6}, }; -level_t defeatindetail2levels[] = +static level_t defeatindetail2levels[] = { {"atac3", "River Crossing"}, {"atac4", "Canyon Chaos"}, {"atac7", "Desert Stormer"}, }; -episode_t defeatindetail2episodes[] = +static 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 roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4}; -gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4}; -gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 11}; -gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1}; -gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1}; -gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3}; -gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1}; +static level_t prydonlevels[] = +{ + {"curig2", "Capel Curig"}, // 0 + + {"tdastart", "Gateway"}, // 1 +}; + +static episode_t prydonepisodes[] = +{ + {"Prydon Gate", 0, 1}, + {"The Dark Age", 1, 1} +}; + +static gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2}; +static gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7}; +static gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6}; +static gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4}; +static gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4}; +static gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 11}; +static gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1}; +static gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1}; +static gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3}; +static gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1}; +static gamelevels_t prydongame = {"Prydon Gate", prydonlevels, prydonepisodes, 2}; typedef struct gameinfo_s { @@ -3686,7 +3883,7 @@ typedef struct gameinfo_s } gameinfo_t; -gameinfo_t gamelist[] = +static gameinfo_t gamelist[] = { {GAME_NORMAL, &sharewarequakegame, ®isteredquakegame}, {GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame}, @@ -3697,24 +3894,33 @@ gameinfo_t gamelist[] = {GAME_BATTLEMECH, &battlemechgame, &battlemechgame}, {GAME_OPENQUARTZ, &openquartzgame, &openquartzgame}, {GAME_DEFEATINDETAIL2, &defeatindetail2game, &defeatindetail2game}, - {(gamemode_t)-1, &sharewarequakegame, ®isteredquakegame} // final fallback + {GAME_PRYDON, &prydongame, &prydongame}, + {GAME_NORMAL, NULL, NULL} // terminator }; -gamelevels_t *lookupgameinfo(void) +static gamelevels_t *lookupgameinfo(void) { - int i; - for (i = 0;gamelist[i].gameid >= 0 && gamelist[i].gameid != gamemode;i++); + int i = 0; + while (gamelist[i].gameid != gamemode) + { + if (gamelist[i].notregistered == NULL) + { + i = 0; + break; + } + i++; + } if (registered.integer) return gamelist[i].registered; else return gamelist[i].notregistered; } -int startepisode; -int startlevel; -int maxplayers; -qboolean m_serverInfoMessage = false; -double m_serverInfoMessageTime; +static int startepisode; +static int startlevel; +static int maxplayers; +static qboolean m_serverInfoMessage = false; +static double m_serverInfoMessageTime; void M_Menu_GameOptions_f (void) { @@ -3728,9 +3934,9 @@ void M_Menu_GameOptions_f (void) } -int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168}; +static int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168}; #define NUM_GAMEOPTIONS 12 -int gameoptions_cursor; +static int gameoptions_cursor; void M_GameOptions_Draw (void) { @@ -3741,7 +3947,7 @@ void M_GameOptions_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/p_multi", false); + p = Draw_CachePic ("gfx/p_multi", true); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); M_DrawTextBox (152, 32, 10, 1); @@ -3885,10 +4091,10 @@ void M_GameOptions_Draw (void) x = (320-26*8)/2; M_DrawTextBox (x, 138, 24, 4); x += 8; - M_Print(x, 146, " More than 64 players?? "); + M_Print(x, 146, " More than 255 players??"); M_Print(x, 154, " First, question your "); M_Print(x, 162, " sanity, then email "); - M_Print(x, 170, " havoc@telefragged.com "); + M_Print(x, 170, " lordhavoc@ghdigital.com"); } else m_serverInfoMessage = false; @@ -3896,7 +4102,7 @@ void M_GameOptions_Draw (void) } -void M_NetStart_Change (int dir) +static void M_NetStart_Change (int dir) { gamelevels_t *g; int count; @@ -4061,7 +4267,7 @@ void M_NetStart_Change (int dir) } } -void M_GameOptions_Key (int key, char ascii) +static void M_GameOptions_Key (int key, char ascii) { gamelevels_t *g; int l; @@ -4132,7 +4338,7 @@ void M_GameOptions_Key (int key, char ascii) break; default: - if (ascii < 32 || ascii > 126) + if (ascii < 32) break; if (gameoptions_cursor == 9) { @@ -4151,7 +4357,7 @@ void M_GameOptions_Key (int key, char ascii) //============================================================================= /* SLIST MENU */ -int slist_cursor; +static int slist_cursor; void M_Menu_ServerList_f (void) { @@ -4160,11 +4366,14 @@ void M_Menu_ServerList_f (void) m_entersound = true; slist_cursor = 0; M_Update_Return_Reason(""); - Net_Slist_f(); + if (lanConfig_cursor == 2) + Net_SlistQW_f(); + else + Net_Slist_f(); } -void M_ServerList_Draw (void) +static void M_ServerList_Draw (void) { int n, y, visible, start, end; cachepic_t *p; @@ -4181,32 +4390,39 @@ void M_ServerList_Draw (void) if (*m_return_reason) M_Print(16, menu_height - 8, m_return_reason); y = 48; - visible = (menu_height - 16 - y) / 8 / 2; + visible = (int)((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", false); + p = Draw_CachePic("gfx/p_multi", true); 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, serverlist_viewlist[n]->line1);y += 8; - M_Print(0, y, serverlist_viewlist[n]->line2);y += 8; + DrawQ_Pic(menu_x, menu_y + y, NULL, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); + 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) + else if (realtime - masterquerytime > 10) { if (masterquerycount) M_Print(0, y, "No servers found"); else M_Print(0, y, "No master servers found (network problem?)"); } + else + { + if (serverquerycount) + M_Print(0, y, "Querying servers"); + else + M_Print(0, y, "Querying master servers"); + } } -void M_ServerList_Key(int k, char ascii) +static void M_ServerList_Key(int k, char ascii) { switch (k) { @@ -4215,7 +4431,10 @@ void M_ServerList_Key(int k, char ascii) break; case K_SPACE: - Net_Slist_f(); + if (lanConfig_cursor == 2) + Net_SlistQW_f(); + else + Net_Slist_f(); break; case K_UPARROW: @@ -4249,34 +4468,34 @@ void M_ServerList_Key(int k, char ascii) //============================================================================= /* Menu Subsystem */ -void M_Keydown(int key, char ascii); -void M_Draw(void); +static void M_KeyEvent(int key, char ascii, qboolean downevent); +static void M_Draw(void); void M_ToggleMenu_f(void); -void M_Shutdown(void); +static void M_Shutdown(void); void M_Init (void) { menuplyr_load = true; menuplyr_pixels = NULL; - Cmd_AddCommand ("menu_main", M_Menu_Main_f); - Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f); - Cmd_AddCommand ("menu_load", M_Menu_Load_f); - Cmd_AddCommand ("menu_save", M_Menu_Save_f); - Cmd_AddCommand ("menu_multiplayer", M_Menu_MultiPlayer_f); - Cmd_AddCommand ("menu_setup", M_Menu_Setup_f); - Cmd_AddCommand ("menu_options", M_Menu_Options_f); - Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f); - Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f); - Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f); - 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); + Cmd_AddCommand ("menu_main", M_Menu_Main_f, "open the main menu"); + Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f, "open the singleplayer menu"); + Cmd_AddCommand ("menu_load", M_Menu_Load_f, "open the loadgame menu"); + Cmd_AddCommand ("menu_save", M_Menu_Save_f, "open the savegame menu"); + Cmd_AddCommand ("menu_multiplayer", M_Menu_MultiPlayer_f, "open the multiplayer menu"); + Cmd_AddCommand ("menu_setup", M_Menu_Setup_f, "open the player setup menu"); + Cmd_AddCommand ("menu_options", M_Menu_Options_f, "open the options menu"); + Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f, "open the effects options menu"); + Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f, "open the graphics options menu"); + Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f, "open the color control menu"); + Cmd_AddCommand ("menu_keys", M_Menu_Keys_f, "open the key binding menu"); + Cmd_AddCommand ("menu_video", M_Menu_Video_f, "open the video options menu"); + Cmd_AddCommand ("menu_reset", M_Menu_Reset_f, "open the reset to defaults menu"); + Cmd_AddCommand ("help", M_Menu_Help_f, "open the help menu"); + Cmd_AddCommand ("menu_quit", M_Menu_Quit_f, "open the quit menu"); + Cmd_AddCommand ("menu_transfusion_episode", M_Menu_Transfusion_Episode_f, "open the transfusion episode select menu"); + Cmd_AddCommand ("menu_transfusion_skill", M_Menu_Transfusion_Skill_f, "open the transfusion skill select menu"); + Cmd_AddCommand ("menu_credits", M_Menu_Credits_f, "open the credits menu"); if (gamemode == GAME_TRANSFUSION) { @@ -4439,31 +4658,34 @@ void M_Draw (void) break; } - if (gamemode == GAME_TRANSFUSION) { + if (gamemode == GAME_TRANSFUSION && !m_missingdata) { if (m_state != m_credits) { - cachepic_t *p; + cachepic_t *p, *drop1, *drop2, *drop3; 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); + p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset), true); + drop1 = Draw_CachePic("gfx/menu/blooddrop1", true); + drop2 = Draw_CachePic("gfx/menu/blooddrop2", true); + drop3 = Draw_CachePic("gfx/menu/blooddrop3", true); 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 + 21, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 116, scale_y_repeat + scale_y + scale_y_rate * scale_y_repeat, drop1, 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 180, scale_y_repeat * .275 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 242, scale_y_repeat * .75 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 304, scale_y_repeat * .25 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 362, scale_y_repeat * .46125 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 402, scale_y_repeat * .1725 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 438, scale_y_repeat * .9 + scale_y + scale_y_rate * scale_y_repeat, drop1, 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 484, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 557, scale_y_repeat * .9425 + scale_y + scale_y_rate * scale_y_repeat, drop1, 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x + 606, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop2, 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); + DrawQ_Pic (scale_x, -1, Draw_CachePic(va("gfx/menu/blooddrip%i", top_offset), true), 0, 0, 1, 1, 1, 1, 0); } } } @@ -4478,8 +4700,10 @@ void M_Draw (void) } -void M_Keydown (int key, char ascii) +void M_KeyEvent (int key, char ascii, qboolean downevent) { + if (!downevent) + return; switch (m_state) { case m_none: @@ -4592,6 +4816,7 @@ mfunction_t *PRVM_ED_FindFunction(const char *); #define M_F_INIT "m_init" #define M_F_KEYDOWN "m_keydown" +#define M_F_KEYUP "m_keyup" #define M_F_DRAW "m_draw" // normal menu names (rest) #define M_F_TOGGLE "m_toggle" @@ -4606,12 +4831,13 @@ M_F_SHUTDOWN, }; #ifdef NG_MENU -qboolean m_displayed; +static qboolean m_displayed; #endif static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*); static func_t m_draw, m_keydown; +static mfunction_t *m_keyup; void MR_SetRouting (qboolean forceold); @@ -4647,7 +4873,7 @@ void MP_Error(const char *format, ...) Host_AbortCurrentFrame(); } -void MP_Keydown (int key, char ascii) +void MP_KeyEvent (int key, char ascii, qboolean downevent) { PRVM_Begin; PRVM_SetProg(PRVM_MENUPROG); @@ -4658,7 +4884,10 @@ void MP_Keydown (int key, char ascii) // pass key 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"); + if (downevent) + PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key, float ascii) required\n"); + else if (m_keyup) + PRVM_ExecuteProgram((func_t)(m_keyup - prog->functions), M_F_KEYUP"(float key, float ascii) required\n"); PRVM_End; } @@ -4751,6 +4980,7 @@ void MP_Init (void) // set m_draw and m_keydown m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions); m_keydown = (func_t) (PRVM_ED_FindFunction(M_F_KEYDOWN) - prog->functions); + m_keyup = PRVM_ED_FindFunction(M_F_KEYUP); #ifdef NG_MENU m_displayed = false; @@ -4773,9 +5003,9 @@ void MP_Restart(void) //============================================================================ // Menu router -static cvar_t forceqmenu = { 0, "forceqmenu", "0" }; +static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)" }; -void (*MR_Keydown) (int key, char ascii); +void (*MR_KeyEvent) (int key, char ascii, qboolean downevent); void (*MR_Draw) (void); void (*MR_ToggleMenu_f) (void); void (*MR_Shutdown) (void); @@ -4788,7 +5018,7 @@ void MR_SetRouting(qboolean forceold) if(!FS_FileExists(M_PROG_FILENAME) || forceqmenu.integer || forceold) { // set menu router function pointers - MR_Keydown = M_Keydown; + MR_KeyEvent = M_KeyEvent; MR_Draw = M_Draw; MR_ToggleMenu_f = M_ToggleMenu_f; MR_Shutdown = M_Shutdown; @@ -4805,7 +5035,7 @@ void MR_SetRouting(qboolean forceold) else { // set menu router function pointers - MR_Keydown = MP_Keydown; + MR_KeyEvent = MP_KeyEvent; MR_Draw = MP_Draw; MR_ToggleMenu_f = MP_ToggleMenu_f; MR_Shutdown = MP_Shutdown; @@ -4839,9 +5069,9 @@ void MR_Init_Commands(void) Cvar_RegisterVariable (&forceqmenu); Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue); if (gamemode == GAME_NETHERWORLD) - Cmd_AddCommand ("menu_fallback", MP_Fallback); //Force to old-style menu - Cmd_AddCommand ("menu_restart",MR_Restart); - Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f); + Cmd_AddCommand ("menu_fallback", MP_Fallback, "switch to engine menu (unload menu.dat)"); //Force to old-style menu + Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat"); + Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu"); } void MR_Init(void)