X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=4467e6666fd736ab5ef76b0be7f2e6cffae9dd35;hp=fd3594382b71f09fac6ace4f9d59722fdcbc4ca1;hb=176db0d8c03f85c51f9afdb7f8478ad89cb91aa8;hpb=d51166488e91ed9bdf1ef6b8ba62fbeb7cde1795 diff --git a/menu.c b/menu.c index fd359438..4467e666 100644 --- a/menu.c +++ b/menu.c @@ -28,11 +28,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define TYPE_GAME 2 #define TYPE_BOTH 3 -mempool_t *menu_mempool; - -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); @@ -56,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) { @@ -117,13 +113,13 @@ void M_Update_Return_Reason(char *s) // Nehahra #define NumberOfNehahraDemos 34 -typedef struct +typedef struct nehahrademonames_s { char *name; char *desc; } nehahrademonames_t; -nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] = +static nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] = { {"intro", "Prologue"}, {"genf", "The Beginning"}, @@ -161,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); - menu_height = bound(1, height, vid.conheight); - menu_x = (vid.conwidth - menu_width) * 0.5; - menu_y = (vid.conheight - 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); + 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_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); } /* @@ -180,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; @@ -188,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, 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); @@ -206,18 +207,18 @@ void M_ItemPrint(float cx, float cy, 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, 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); } -qbyte identityTable[256]; -qbyte 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; - qbyte *dest, *source; + unsigned char *dest, *source; for (j = 0; j < 256; j++) identityTable[j] = j; @@ -240,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; @@ -249,42 +249,42 @@ void M_DrawTextBox (float x, float y, float width, float height) // 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"); } //============================================================================= @@ -310,8 +310,8 @@ void M_ToggleMenu_f (void) } -int demo_cursor; -void M_Demo_Draw (void) +static int demo_cursor; +static void M_Demo_Draw (void) { int i; @@ -332,7 +332,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) { @@ -368,9 +369,10 @@ void M_Demo_Key (int k, char ascii) //============================================================================= /* MAIN MENU */ -int m_main_cursor; +static int m_main_cursor; + +static int MAIN_ITEMS = 4; // Nehahra: Menu Disable -int MAIN_ITEMS = 4; // Nehahra: Menu Disable void M_Menu_Main_f (void) { @@ -391,6 +393,9 @@ void M_Menu_Main_f (void) else MAIN_ITEMS = 7; } + else if (gamemode == GAME_NEXUIZ) { + MAIN_ITEMS = 2; + } else MAIN_ITEMS = 5; @@ -407,7 +412,7 @@ void M_Menu_Main_f (void) } -void M_Main_Draw (void) +static void M_Main_Draw (void) { int f; cachepic_t *p; @@ -415,49 +420,60 @@ void M_Main_Draw (void) if (gamemode == GAME_TRANSFUSION) { int y1, y2, y3; M_Background(640, 480); - p = Draw_CachePic ("gfx/tb-transfusion"); - 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; + } + else if (gamemode == GAME_NEXUIZ) + { + M_Background(640, 480); //fall back is always to 640x480, this makes it most readable at that. + M_PrintRed (40, (480/3)-16, "You have reached this menu due to missing or unlocatable content/data"); + M_Print ((640/2)-92, (480/3), "You may consider adding"); + M_Print ((640/2)-136, (480/3)+8, "-basedir /path/to/nexuiz"); + M_Print ((640/2)-76, (480/3)+16, "to your launch commandline"); + 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; } - M_Background(320, 200); - 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_DrawPic (16, 4, "gfx/qplaque"); + p = Draw_CachePic ("gfx/ttl_main", true); + 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)); } -void M_Main_Key (int key, char ascii) +static void M_Main_Key (int key, char ascii) { switch (key) { @@ -671,6 +687,22 @@ void M_Main_Key (int key, char ascii) } } } + else if (gamemode == GAME_NEXUIZ) { + 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 { switch (m_main_cursor) @@ -702,7 +734,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 @@ -714,24 +746,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.lmp"); - p = Draw_CachePic ("gfx/ttl_sgl.lmp"); + M_DrawPic (16, 4, "gfx/qplaque"); + 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.lmp"); + 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"); @@ -741,19 +771,19 @@ void M_SinglePlayer_Draw (void) { 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)); } } -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; @@ -813,13 +843,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]; @@ -832,7 +862,7 @@ void M_ScanSaves (void) { strcpy (m_filenames[i], "--- UNUSED SLOT ---"); loadable[i] = false; - sprintf (name, "s%i.sav", i); + sprintf (name, "s%i.sav", (int)i); f = FS_Open (name, "rb", false, false); if (!f) continue; @@ -880,15 +910,15 @@ void M_Menu_Save_f (void) } -void M_Load_Draw (void) +static void M_Load_Draw (void) { int i; cachepic_t *p; 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", true); + 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]); @@ -898,15 +928,15 @@ 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.lmp"); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp"); + 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) { @@ -1052,7 +1082,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) @@ -1062,23 +1092,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"); - 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) { @@ -1152,7 +1182,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 @@ -1164,7 +1194,7 @@ void M_Menu_MultiPlayer_f (void) } -void M_MultiPlayer_Draw (void) +static void M_MultiPlayer_Draw (void) { int f; cachepic_t *p; @@ -1172,27 +1202,27 @@ void M_MultiPlayer_Draw (void) if (gamemode == GAME_TRANSFUSION) { M_Background(640, 480); - p = Draw_CachePic ("gfx/tb-online"); - 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.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", true); + 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)); } -void M_MultiPlayer_Key (int key, char ascii) +static void M_MultiPlayer_Key (int key, char ascii) { switch (key) { @@ -1231,16 +1261,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 @@ -1256,7 +1286,7 @@ void M_Menu_Setup_f (void) } 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 @@ -1292,20 +1322,20 @@ 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; 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", 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) { @@ -1322,18 +1352,19 @@ void M_Setup_Draw (void) // 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(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); } @@ -1347,11 +1378,11 @@ 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]]]; - Draw_NewPic("gfx/menuplyr.lmp", menuplyr_width, menuplyr_height, true, (qbyte *)menuplyr_translated); + 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.lmp"); - M_DrawPic(172, 56, "gfx/menuplyr.lmp"); + M_DrawPic(160, 48, "gfx/bigbox"); + M_DrawPic(172, 56, "gfx/menuplyr"); } if (setup_cursor == 0) @@ -1361,7 +1392,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; @@ -1447,11 +1478,11 @@ forward: 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; @@ -1475,7 +1506,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; @@ -1493,7 +1524,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"); @@ -1504,7 +1535,7 @@ void M_DrawCheckbox (int x, int y, int on) #define OPTIONS_ITEMS 40 -int options_cursor; +static int options_cursor; void M_Menu_Options_f (void) { @@ -1518,7 +1549,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"); @@ -1547,9 +1578,9 @@ void M_Menu_Options_AdjustSliders (int dir) 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++) @@ -1565,7 +1596,7 @@ void M_Menu_Options_AdjustSliders (int dir) 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++) @@ -1603,55 +1634,55 @@ 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(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(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 + 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) +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 + strlen(s) * 8 + 8, opty, value, minvalue, maxvalue); + M_DrawSlider(0 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue); } opty += 8; optnum++; } -void M_Options_Draw (void) +static void M_Options_Draw (void) { int visible; cachepic_t *p; - M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid.conheight)); + 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", true); + M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optnum = 0; optcursor = options_cursor; @@ -1676,8 +1707,8 @@ 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_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); @@ -1701,7 +1732,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) { @@ -1766,9 +1797,9 @@ void M_Options_Key (int k, char ascii) } } -#define OPTIONS_EFFECTS_ITEMS 37 +#define OPTIONS_EFFECTS_ITEMS 35 -int options_effects_cursor; +static int options_effects_cursor; void M_Menu_Options_Effects_f (void) { @@ -1778,11 +1809,9 @@ void M_Menu_Options_Effects_f (void) } -extern cvar_t r_detailtextures; extern cvar_t cl_stainmaps; 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_beams_polygon; @@ -1796,23 +1825,22 @@ 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"); 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_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); @@ -1838,36 +1866,34 @@ void M_Menu_Options_Effects_AdjustSliders (int dir) 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) +static void M_Options_Effects_Draw (void) { int visible; cachepic_t *p; - M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid.conheight)); + 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", true); + M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_effects_cursor; optnum = 0; 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_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); @@ -1893,11 +1919,10 @@ void M_Options_Effects_Draw (void) 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); } -void M_Options_Effects_Key (int k, char ascii) +static void M_Options_Effects_Key (int k, char ascii) { switch (k) { @@ -1934,9 +1959,9 @@ void M_Options_Effects_Key (int k, char ascii) } -#define OPTIONS_GRAPHICS_ITEMS 12 +#define OPTIONS_GRAPHICS_ITEMS 14 -int options_graphics_cursor; +static int options_graphics_cursor; void M_Menu_Options_Graphics_f (void) { @@ -1957,8 +1982,9 @@ 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) +static void M_Menu_Options_Graphics_AdjustSliders (int dir) { int optnum; S_LocalSound ("sound/misc/menu3.wav"); @@ -1977,19 +2003,21 @@ void M_Menu_Options_Graphics_AdjustSliders (int dir) 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"); } -void M_Options_Graphics_Draw (void) +static void M_Options_Graphics_Draw (void) { int visible; cachepic_t *p; - M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid.conheight)); + 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", true); + M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_graphics_cursor; optnum = 0; @@ -2008,10 +2036,12 @@ void M_Options_Graphics_Draw (void) 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); } -void M_Options_Graphics_Key (int k, char ascii) +static void M_Options_Graphics_Key (int k, char ascii) { switch (k) { @@ -2050,10 +2080,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.25", "intensity value that matches up to white/black dither pattern, due to Quake's grey level being quite dark this is 0.25, other games may use other values"}; void M_Menu_Options_ColorControl_f (void) { @@ -2063,7 +2093,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; @@ -2162,17 +2192,19 @@ 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.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", true); + M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_colorcontrol_cursor; optnum = 0; @@ -2199,44 +2231,44 @@ 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; - 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; - 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, 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, 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, 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_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, 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.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_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.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_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.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_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.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_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) { @@ -2298,7 +2330,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"}, @@ -2321,7 +2353,7 @@ char *quakebindnames[][2] = {"+movedown", "swim down"} }; -char *transfusionbindnames[][2] = +static char *transfusionbindnames[][2] = { {"", "Movement"}, // Movement commands {"+forward", "walk forward"}, @@ -2379,7 +2411,7 @@ char *transfusionbindnames[][2] = {"impulse 79", "taunt 9"} }; -char *goodvsbad2bindnames[][2] = +static char *goodvsbad2bindnames[][2] = { {"impulse 69", "Power 1"}, {"impulse 70", "Power 2"}, @@ -2402,8 +2434,8 @@ char *goodvsbad2bindnames[][2] = {"+movedown", "swim down"} }; -int numcommands; -char *(*bindnames)[2]; +static int numcommands; +static char *(*bindnames)[2]; /* typedef struct binditem_s @@ -2421,9 +2453,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) { @@ -2438,7 +2470,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); @@ -2448,7 +2480,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) { @@ -2462,7 +2494,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"); @@ -2496,8 +2528,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) { @@ -2508,7 +2540,7 @@ void M_Menu_Keys_f (void) #define NUMKEYS 5 -void M_FindKeysForCommand (char *command, int *keys) +void M_FindKeysForCommand (const char *command, int *keys) { int count; int j; @@ -2533,7 +2565,7 @@ void M_FindKeysForCommand (char *command, int *keys) } } -void M_UnbindCommand (char *command) +static void M_UnbindCommand (char *command) { int j; char *b; @@ -2549,18 +2581,18 @@ void M_UnbindCommand (char *command) } -void M_Keys_Draw (void) +static void M_Keys_Draw (void) { int i, 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", true); + 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"); @@ -2610,7 +2642,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]; @@ -2686,7 +2718,7 @@ 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) { @@ -2707,7 +2739,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); @@ -2719,132 +2751,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; - -extern int current_vid_fullscreen; -extern int current_vid_width; -extern int current_vid_height; -extern int current_vid_bitsperpixel; +#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] == 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) +static 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", true); + M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes"); + + // 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)); - // 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); + // 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, 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 (); @@ -2854,7 +2977,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; @@ -2890,7 +3018,7 @@ void M_Video_Key (int key, char ascii) //============================================================================= /* HELP MENU */ -int help_page; +static int help_page; #define NUM_HELP_PAGES 6 @@ -2904,14 +3032,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.lmp", help_page)); + 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) { @@ -2948,17 +3076,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 (); } @@ -2966,12 +3094,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; @@ -2985,7 +3113,7 @@ 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) { switch (gamemode) { @@ -2993,6 +3121,7 @@ int M_ChooseQuitMessage(int request) 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); @@ -3031,6 +3160,9 @@ int M_ChooseQuitMessage(int request) if (request-- == 0) return M_QuitMessage("You prefer free beer over free speech?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL); if (request-- == 0) return M_QuitMessage("Is OpenQuartz Propaganda?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL); break; + case GAME_NEXUIZ: //frag related quit messages are pointless for a fallback menu! + 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); + break; default: if (request-- == 0) return M_QuitMessage("Tired of fragging already?",NULL,NULL,NULL,NULL,NULL,NULL,NULL); if (request-- == 0) return M_QuitMessage("Quit now and forfeit your bodycount?",NULL,NULL,NULL,NULL,NULL,NULL,NULL); @@ -3058,7 +3190,7 @@ void M_Menu_Quit_f (void) } -void M_Quit_Key (int key, char ascii) +static void M_Quit_Key (int key, char ascii) { switch (key) { @@ -3067,7 +3199,7 @@ void M_Quit_Key (int key, char ascii) case 'N': if (wasInMenus) { - m_state = m_quit_prevstate; + m_state = (enum m_state_e)m_quit_prevstate; m_entersound = true; } else @@ -3087,12 +3219,12 @@ 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++) { - if ((l = strlen(m_quit_message[i]))) + if ((l = (int)strlen(m_quit_message[i]))) { if (firstline > i) firstline = i; @@ -3104,7 +3236,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 (gamemode != GAME_NEXUIZ) //since this is a fallback menu for Nexuiz (no graphics), 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 Nexuiz 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]); } @@ -3112,13 +3245,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) { @@ -3139,7 +3272,7 @@ void M_Menu_LanConfig_f (void) } -void M_LanConfig_Draw (void) +static void M_LanConfig_Draw (void) { cachepic_t *p; int basex; @@ -3148,10 +3281,10 @@ void M_LanConfig_Draw (void) 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", true); 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"; @@ -3167,10 +3300,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 { @@ -3181,17 +3315,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; @@ -3206,6 +3340,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: @@ -3213,6 +3350,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: @@ -3225,7 +3365,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) { @@ -3236,7 +3376,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; @@ -3247,7 +3387,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; @@ -3255,12 +3395,12 @@ 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 = strlen(lanConfig_joinname); + l = (int)strlen(lanConfig_joinname); if (l < 21) { lanConfig_joinname[l+1] = 0; @@ -3272,7 +3412,7 @@ void M_LanConfig_Key (int key, char ascii) break; if (lanConfig_cursor == 0) { - l = strlen(lanConfig_portname); + l = (int)strlen(lanConfig_portname); if (l < 5) { lanConfig_portname[l+1] = 0; @@ -3281,7 +3421,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; @@ -3298,20 +3438,20 @@ void M_LanConfig_Key (int key, char ascii) //============================================================================= /* 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; @@ -3320,7 +3460,7 @@ typedef struct } gamelevels_t; -level_t quakelevels[] = +static level_t quakelevels[] = { {"start", "Entrance"}, // 0 @@ -3368,7 +3508,7 @@ level_t quakelevels[] = {"dm6", "The Dark Zone"} }; -episode_t quakeepisodes[] = +static episode_t quakeepisodes[] = { {"Welcome to Quake", 0, 1}, {"Doomed Dimension", 1, 8}, @@ -3380,7 +3520,7 @@ episode_t quakeepisodes[] = }; //MED 01/06/97 added hipnotic levels -level_t hipnoticlevels[] = +static level_t hipnoticlevels[] = { {"start", "Command HQ"}, // 0 @@ -3408,7 +3548,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}, @@ -3420,7 +3560,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"}, @@ -3443,7 +3583,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}, @@ -3451,7 +3591,7 @@ episode_t rogueepisodes[] = {"Deathmatch Arena", 16, 1} }; -level_t nehahralevels[] = +static level_t nehahralevels[] = { {"nehstart", "Welcome to Nehahra"}, {"neh1m1", "Forge City1: Slipgates"}, @@ -3474,7 +3614,7 @@ level_t nehahralevels[] = {"nehend", "Quintessence"} }; -episode_t nehahraepisodes[] = +static episode_t nehahraepisodes[] = { {"Welcome to Nehahra", 0, 1}, {"The Fall of Forge", 1, 9}, @@ -3483,7 +3623,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"}, @@ -3584,11 +3724,14 @@ level_t transfusionlevels[] = {"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"} }; -episode_t transfusionepisodes[] = +static episode_t transfusionepisodes[] = { {"The Way of All Flesh", 0, 8}, {"Even Death May Die", 8, 9}, @@ -3598,12 +3741,12 @@ episode_t transfusionepisodes[] = {"Post Mortem", 45, 9}, {"Cryptic Passage", 54, 10}, {"Cryptic BloodBath", 64, 4}, - {"Blood 2", 68, 6}, - {"Transfusion", 74, 9}, - {"Conversions", 83, 6} + {"Blood 2", 68, 8}, + {"Transfusion", 76, 9}, + {"Conversions", 85, 9} }; -level_t goodvsbad2levels[] = +static level_t goodvsbad2levels[] = { {"rts", "Many Paths"}, // 0 {"chess", "Chess, Scott Hess"}, // 1 @@ -3616,12 +3759,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 @@ -3632,12 +3775,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"}, @@ -3656,32 +3799,45 @@ 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}, }; -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}; +static level_t defeatindetail2levels[] = +{ + {"atac3", "River Crossing"}, + {"atac4", "Canyon Chaos"}, + {"atac7", "Desert Stormer"}, +}; -typedef struct +static episode_t defeatindetail2episodes[] = { - int gameid; + {"ATAC Campaign", 0, 3}, +}; + +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}; + +typedef struct gameinfo_s +{ + gamemode_t gameid; gamelevels_t *notregistered; gamelevels_t *registered; } gameinfo_t; -gameinfo_t gamelist[] = +static gameinfo_t gamelist[] = { {GAME_NORMAL, &sharewarequakegame, ®isteredquakegame}, {GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame}, @@ -3691,10 +3847,11 @@ gameinfo_t gamelist[] = {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) +static gamelevels_t *lookupgameinfo(void) { int i; for (i = 0;gamelist[i].gameid >= 0 && gamelist[i].gameid != gamemode;i++); @@ -3704,11 +3861,11 @@ gamelevels_t *lookupgameinfo(void) 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) { @@ -3722,9 +3879,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) { @@ -3734,9 +3891,9 @@ void M_GameOptions_Draw (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", true); + M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); M_DrawTextBox (152, 32, 10, 1); M_Print(160, 40, "begin game"); @@ -3879,10 +4036,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; @@ -3890,7 +4047,7 @@ void M_GameOptions_Draw (void) } -void M_NetStart_Change (int dir) +static void M_NetStart_Change (int dir) { gamelevels_t *g; int count; @@ -4055,7 +4212,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; @@ -4114,7 +4271,7 @@ void M_GameOptions_Key (int key, char ascii) case K_BACKSPACE: if (gameoptions_cursor == 9) { - l = strlen(hostname.string); + l = (int)strlen(hostname.string); if (l) { l = min(l - 1, 37); @@ -4126,11 +4283,11 @@ void M_GameOptions_Key (int key, char ascii) 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); @@ -4145,7 +4302,7 @@ void M_GameOptions_Key (int key, char ascii) //============================================================================= /* SLIST MENU */ -int slist_cursor; +static int slist_cursor; void M_Menu_ServerList_f (void) { @@ -4154,11 +4311,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; @@ -4166,9 +4326,9 @@ void M_ServerList_Draw (void) // use as much vertical space as available if (gamemode == GAME_TRANSFUSION) - M_Background(640, vid.conheight - 80); + M_Background(640, vid_conheight.integer - 80); else - M_Background(640, vid.conheight); + 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); @@ -4176,31 +4336,38 @@ void M_ServerList_Draw (void) M_Print(16, menu_height - 8, m_return_reason); y = 48; visible = (menu_height - 16 - y) / 8 / 2; - start = bound(0, slist_cursor - (visible >> 1), hostcache_viewcount - visible); - end = min(start + visible, hostcache_viewcount); + 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", 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, hostcache_viewset[n]->line1);y += 8; - M_Print(0, y, hostcache_viewset[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) { @@ -4209,7 +4376,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: @@ -4217,21 +4387,21 @@ void M_ServerList_Key(int k, char ascii) S_LocalSound ("sound/misc/menu1.wav"); slist_cursor--; if (slist_cursor < 0) - slist_cursor = hostcache_viewcount - 1; + slist_cursor = serverlist_viewcount - 1; break; case K_DOWNARROW: case K_RIGHTARROW: S_LocalSound ("sound/misc/menu1.wav"); slist_cursor++; - if (slist_cursor >= hostcache_viewcount) + if (slist_cursor >= serverlist_viewcount) slist_cursor = 0; break; case K_ENTER: S_LocalSound ("sound/misc/menu2.wav"); - if (hostcache_viewcount) - Cbuf_AddText(va("connect \"%s\"\n", hostcache_viewset[slist_cursor]->info.cname)); + if (serverlist_viewcount) + Cbuf_AddText(va("connect \"%s\"\n", serverlist_viewlist[slist_cursor]->info.cname)); break; default: @@ -4243,36 +4413,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_Keydown(int key, char ascii); +static void M_Draw(void); void M_ToggleMenu_f(void); -void M_Shutdown(void); +static void M_Shutdown(void); void M_Init (void) { - menu_mempool = Mem_AllocPool("Menu", 0, NULL); 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); - 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); + 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) { @@ -4437,29 +4605,32 @@ void M_Draw (void) if (gamemode == GAME_TRANSFUSION) { 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 * 2; + 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)); - for (scale_x = 0; scale_x <= vid.conwidth; scale_x += p->width) { - for (scale_y = -scale_y_repeat; scale_y <= vid.conheight; 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); + 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, 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); } } } @@ -4576,8 +4747,6 @@ void M_Shutdown(void) { // reset key_dest key_dest = key_game; - - Mem_FreePool (&menu_mempool); } void M_Restart(void) @@ -4604,7 +4773,7 @@ M_F_SHUTDOWN, }; #ifdef NG_MENU -qboolean m_displayed; +static qboolean m_displayed; #endif static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*); @@ -4613,8 +4782,25 @@ static func_t m_draw, m_keydown; 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 @@ -4622,10 +4808,10 @@ void MP_Error(void) 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) @@ -4637,8 +4823,8 @@ 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; @@ -4697,14 +4883,25 @@ void MP_Shutdown (void) 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; @@ -4714,11 +4911,9 @@ void MP_Init (void) 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); @@ -4745,7 +4940,12 @@ 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_Draw) (void); +void (*MR_ToggleMenu_f) (void); +void (*MR_Shutdown) (void); void MR_SetRouting(qboolean forceold) { @@ -4795,6 +4995,7 @@ void MR_Restart(void) void Call_MR_ToggleMenu_f(void) { + Host_StartVideo(); if(MR_ToggleMenu_f) MR_ToggleMenu_f(); } @@ -4803,10 +5004,11 @@ void MR_Init_Commands(void) { // 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_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)