X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=ce154097118e91e32c8aef969f53f0c789caa89a;hp=5df5370fe419708336d411ef9e340adfbd57a78b;hb=00b6d96fd1220b1df82036c445389ae19a08709e;hpb=135f08ba52321984c05e36cdf42ad81420a4d2fd diff --git a/menu.c b/menu.c index 5df5370f..ce154097 100644 --- a/menu.c +++ b/menu.c @@ -28,35 +28,36 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define TYPE_GAME 2 #define TYPE_BOTH 3 -static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)" }; +static cvar_t forceqmenu = {CF_CLIENT, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)"}; +static cvar_t menu_progs = {CF_CLIENT, "menu_progs", "menu.dat", "name of quakec menu.dat file"}; static int NehGameType; enum m_state_e m_state; char m_return_reason[128]; -void M_Menu_Main_f (void); - void M_Menu_SinglePlayer_f (void); - void M_Menu_Transfusion_Episode_f (void); - void M_Menu_Transfusion_Skill_f (void); - void M_Menu_Load_f (void); - void M_Menu_Save_f (void); - void M_Menu_MultiPlayer_f (void); - void M_Menu_Setup_f (void); - void M_Menu_Options_f (void); - void M_Menu_Options_Effects_f (void); - void M_Menu_Options_Graphics_f (void); - void M_Menu_Options_ColorControl_f (void); - void M_Menu_Keys_f (void); - void M_Menu_Reset_f (void); - void M_Menu_Video_f (void); - void M_Menu_Help_f (void); - void M_Menu_Credits_f (void); - void M_Menu_Quit_f (void); -void M_Menu_LanConfig_f (void); -void M_Menu_GameOptions_f (void); -void M_Menu_ServerList_f (void); -void M_Menu_ModList_f (void); +void M_Menu_Main_f(cmd_state_t *cmd); + void M_Menu_SinglePlayer_f(cmd_state_t *cmd); + void M_Menu_Transfusion_Episode_f(cmd_state_t *cmd); + void M_Menu_Transfusion_Skill_f(cmd_state_t *cmd); + void M_Menu_Load_f(cmd_state_t *cmd); + void M_Menu_Save_f(cmd_state_t *cmd); + void M_Menu_MultiPlayer_f(cmd_state_t *cmd); + void M_Menu_Setup_f(cmd_state_t *cmd); + void M_Menu_Options_f(cmd_state_t *cmd); + void M_Menu_Options_Effects_f(cmd_state_t *cmd); + void M_Menu_Options_Graphics_f(cmd_state_t *cmd); + void M_Menu_Options_ColorControl_f(cmd_state_t *cmd); + void M_Menu_Keys_f(cmd_state_t *cmd); + void M_Menu_Reset_f(cmd_state_t *cmd); + void M_Menu_Video_f(cmd_state_t *cmd); + void M_Menu_Help_f(cmd_state_t *cmd); + void M_Menu_Credits_f(cmd_state_t *cmd); + void M_Menu_Quit_f(cmd_state_t *cmd); +void M_Menu_LanConfig_f(cmd_state_t *cmd); +void M_Menu_GameOptions_f(cmd_state_t *cmd); +void M_Menu_ServerList_f(cmd_state_t *cmd); +void M_Menu_ModList_f(cmd_state_t *cmd); static void M_Main_Draw (void); static void M_SinglePlayer_Draw (void); @@ -82,30 +83,30 @@ static void M_ServerList_Draw (void); static void M_ModList_Draw (void); -static void M_Main_Key (int key, int ascii); - static void M_SinglePlayer_Key (int key, int ascii); - static void M_Transfusion_Episode_Key (int key, int ascii); - static void M_Transfusion_Skill_Key (int key, int ascii); - static void M_Load_Key (int key, int ascii); - static void M_Save_Key (int key, int ascii); - static void M_MultiPlayer_Key (int key, int ascii); - static void M_Setup_Key (int key, int ascii); - static void M_Options_Key (int key, int ascii); - static void M_Options_Effects_Key (int key, int ascii); - static void M_Options_Graphics_Key (int key, int ascii); - static void M_Options_ColorControl_Key (int key, int ascii); - static void M_Keys_Key (int key, int ascii); - static void M_Reset_Key (int key, int ascii); - static void M_Video_Key (int key, int ascii); - static void M_Help_Key (int key, int ascii); - static void M_Credits_Key (int key, int ascii); - static void M_Quit_Key (int key, int ascii); -static void M_LanConfig_Key (int key, int ascii); -static void M_GameOptions_Key (int key, int ascii); -static void M_ServerList_Key (int key, int ascii); -static void M_ModList_Key (int key, int ascii); - -static qboolean m_entersound; ///< play after drawing a frame, so caching won't disrupt the sound +static void M_Main_Key(cmd_state_t *cmd, int key, int ascii); + static void M_SinglePlayer_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Transfusion_Episode_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Transfusion_Skill_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Load_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Save_Key(cmd_state_t *cmd, int key, int ascii); + static void M_MultiPlayer_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Setup_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Options_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Options_Effects_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Options_Graphics_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Options_ColorControl_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Keys_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Reset_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Video_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Help_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Credits_Key(cmd_state_t *cmd, int key, int ascii); + static void M_Quit_Key(cmd_state_t *cmd, int key, int ascii); +static void M_LanConfig_Key(cmd_state_t *cmd, int key, int ascii); +static void M_GameOptions_Key(cmd_state_t *cmd, int key, int ascii); +static void M_ServerList_Key(cmd_state_t *cmd, int key, int ascii); +static void M_ModList_Key(cmd_state_t *cmd, int key, int ascii); + +static qbool m_entersound; ///< play after drawing a frame, so caching won't disrupt the sound void M_Update_Return_Reason(const char *s) { @@ -273,7 +274,7 @@ static void M_DrawTextBox(float x, float y, float width, float height) M_ToggleMenu ================ */ -void M_ToggleMenu(int mode) +static void M_ToggleMenu(int mode) { m_entersound = true; @@ -281,7 +282,7 @@ void M_ToggleMenu(int mode) { if(mode == 0) return; // the menu is off, and we want it off - M_Menu_Main_f (); + M_Menu_Main_f (cmd_local); } else { @@ -304,11 +305,11 @@ static void M_Demo_Draw (void) M_Print(16, 16 + 8*i, NehahraDemos[i].desc); // line cursor - M_DrawCharacter (8, 16 + demo_cursor*8, 12+((int)(realtime*4)&1)); + M_DrawCharacter (8, 16 + demo_cursor*8, 12+((int)(host.realtime*4)&1)); } -void M_Menu_Demos_f (void) +static void M_Menu_Demos_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_demo; @@ -316,19 +317,20 @@ void M_Menu_Demos_f (void) } -static void M_Demo_Key (int k, int ascii) +static void M_Demo_Key (cmd_state_t *cmd, int k, int ascii) { + char vabuf[1024]; switch (k) { case K_ESCAPE: - M_Menu_Main_f (); + M_Menu_Main_f (cmd); break; case K_ENTER: S_LocalSound ("sound/misc/menu2.wav"); m_state = m_none; key_dest = key_game; - Cbuf_AddText (va ("playdemo %s\n", NehahraDemos[demo_cursor].name)); + Cbuf_AddText (cmd, va(vabuf, sizeof(vabuf), "playdemo %s\n", NehahraDemos[demo_cursor].name)); return; case K_UPARROW: @@ -353,12 +355,12 @@ static void M_Demo_Key (int k, int ascii) /* MAIN MENU */ static int m_main_cursor; -static qboolean m_missingdata = false; +static qbool m_missingdata = false; static int MAIN_ITEMS = 4; // Nehahra: Menu Disable -void M_Menu_Main_f (void) +void M_Menu_Main_f(cmd_state_t *cmd) { const char *s; s = "gfx/mainmenu"; @@ -410,7 +412,7 @@ void M_Menu_Main_f (void) MAIN_ITEMS = 5; // check if the game data is missing and use a different main menu if so - m_missingdata = !forceqmenu.integer && Draw_CachePic (s)->tex == r_texture_notexture; + m_missingdata = !forceqmenu.integer && !Draw_IsPicLoaded(Draw_CachePic_Flags(s, CACHEPICFLAG_FAILONMISSING)); if (m_missingdata) MAIN_ITEMS = 2; @@ -431,6 +433,7 @@ static void M_Main_Draw (void) { int f; cachepic_t *p; + char vabuf[1024]; if (m_missingdata) { @@ -445,7 +448,7 @@ static void M_Main_Draw (void) s = "to your launch commandline";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8; M_Print (640/2 - 48, 480/2, "Open Console"); //The console usually better shows errors (failures) M_Print (640/2 - 48, 480/2 + 8, "Quit"); - M_DrawCharacter(640/2 - 56, 480/2 + (8 * m_main_cursor), 12+((int)(realtime*4)&1)); + M_DrawCharacter(640/2 - 56, 480/2 + (8 * m_main_cursor), 12+((int)(host.realtime*4)&1)); return; } @@ -453,28 +456,28 @@ static void M_Main_Draw (void) int y1, y2, y3; M_Background(640, 480); p = Draw_CachePic ("gfx/menu/tb-transfusion"); - M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-transfusion"); + M_DrawPic (640/2 - Draw_GetPicWidth(p)/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/menu/mainmenu%i", y1)); + M_DrawPic (0, y2, va(vabuf, sizeof(vabuf), "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/menu/mainmenu%iselected", y3)); + M_DrawPic (0, 120 + m_main_cursor * 40, va(vabuf, sizeof(vabuf), "gfx/menu/mainmenu%iselected", y3)); return; } M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/ttl_main"); - M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main"); + M_DrawPic ( (320-Draw_GetPicWidth(p))/2, 4, "gfx/ttl_main"); // Nehahra if (gamemode == GAME_NEHAHRA) { @@ -488,13 +491,13 @@ static void M_Main_Draw (void) else M_DrawPic (72, 32, "gfx/mainmenu"); - f = (int)(realtime * 10)%6; + f = (int)(host.realtime * 10)%6; - M_DrawPic (54, 32 + m_main_cursor * 20, va("gfx/menudot%i", f+1)); + M_DrawPic (54, 32 + m_main_cursor * 20, va(vabuf, sizeof(vabuf), "gfx/menudot%i", f+1)); } -static void M_Main_Key (int key, int ascii) +static void M_Main_Key(cmd_state_t *cmd, int key, int ascii) { switch (key) { @@ -531,10 +534,10 @@ static void M_Main_Key (int key, int ascii) m_state = m_none; key_dest = key_game; } - Con_ToggleConsole_f (); + Con_ToggleConsole_f(cmd); break; case 1: - M_Menu_Quit_f (); + M_Menu_Quit_f(cmd); break; } } @@ -546,30 +549,30 @@ static void M_Main_Key (int key, int ascii) switch (m_main_cursor) { case 0: - M_Menu_SinglePlayer_f (); + M_Menu_SinglePlayer_f(cmd); break; case 1: - M_Menu_Demos_f (); + M_Menu_Demos_f(cmd); break; case 2: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case 3: - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case 4: key_dest = key_game; if (sv.active) - Cbuf_AddText ("disconnect\n"); - Cbuf_AddText ("playdemo endcred\n"); + Cbuf_AddText (cmd, "disconnect\n"); + Cbuf_AddText (cmd, "playdemo endcred\n"); break; case 5: - M_Menu_Quit_f (); + M_Menu_Quit_f(cmd); break; } break; @@ -577,26 +580,26 @@ static void M_Main_Key (int key, int ascii) switch (m_main_cursor) { case 0: - M_Menu_SinglePlayer_f (); + M_Menu_SinglePlayer_f(cmd); break; case 1: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case 2: - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case 3: key_dest = key_game; if (sv.active) - Cbuf_AddText ("disconnect\n"); - Cbuf_AddText ("playdemo endcred\n"); + Cbuf_AddText (cmd, "disconnect\n"); + Cbuf_AddText (cmd, "playdemo endcred\n"); break; case 4: - M_Menu_Quit_f (); + M_Menu_Quit_f(cmd); break; } break; @@ -604,22 +607,22 @@ static void M_Main_Key (int key, int ascii) switch (m_main_cursor) { case 0: - M_Menu_Demos_f (); + M_Menu_Demos_f(cmd); break; case 1: key_dest = key_game; if (sv.active) - Cbuf_AddText ("disconnect\n"); - Cbuf_AddText ("playdemo endcred\n"); + Cbuf_AddText (cmd, "disconnect\n"); + Cbuf_AddText (cmd, "playdemo endcred\n"); break; case 2: - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case 3: - M_Menu_Quit_f (); + M_Menu_Quit_f(cmd); break; } break; @@ -631,31 +634,31 @@ static void M_Main_Key (int key, int ascii) switch (m_main_cursor) { case 0: - M_Menu_Transfusion_Episode_f (); + M_Menu_Transfusion_Episode_f(cmd); break; case 1: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case 2: - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case 3: - M_Menu_Load_f (); + M_Menu_Load_f(cmd); break; case 4: - M_Menu_Help_f (); + M_Menu_Help_f(cmd); break; case 5: - M_Menu_Credits_f (); + M_Menu_Credits_f(cmd); break; case 6: - M_Menu_Quit_f (); + M_Menu_Quit_f(cmd); break; } } @@ -664,35 +667,35 @@ static void M_Main_Key (int key, int ascii) switch (m_main_cursor) { case 0: - M_Menu_Transfusion_Episode_f (); + M_Menu_Transfusion_Episode_f(cmd); break; case 1: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case 2: - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case 3: - M_Menu_Save_f (); + M_Menu_Save_f(cmd); break; case 4: - M_Menu_Load_f (); + M_Menu_Load_f(cmd); break; case 5: - M_Menu_Help_f (); + M_Menu_Help_f(cmd); break; case 6: - M_Menu_Credits_f (); + M_Menu_Credits_f(cmd); break; case 7: - M_Menu_Quit_f (); + M_Menu_Quit_f(cmd); break; } } @@ -702,23 +705,23 @@ static void M_Main_Key (int key, int ascii) switch (m_main_cursor) { case 0: - M_Menu_SinglePlayer_f (); + M_Menu_SinglePlayer_f(cmd); break; case 1: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case 2: - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case 3: - M_Menu_Help_f (); + M_Menu_Help_f(cmd); break; case 4: - M_Menu_Quit_f (); + M_Menu_Quit_f(cmd); break; } } @@ -732,7 +735,7 @@ static int m_singleplayer_cursor; #define SINGLEPLAYER_ITEMS 3 -void M_Menu_SinglePlayer_f (void) +void M_Menu_SinglePlayer_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_singleplayer; @@ -743,6 +746,7 @@ void M_Menu_SinglePlayer_f (void) static void M_SinglePlayer_Draw (void) { cachepic_t *p; + char vabuf[1024]; M_Background(320, 200); @@ -752,7 +756,7 @@ static void M_SinglePlayer_Draw (void) // Some mods don't have a single player mode if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { - M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl"); + M_DrawPic ((320 - Draw_GetPicWidth(p)) / 2, 4, "gfx/ttl_sgl"); M_DrawTextBox (60, 8 * 8, 23, 4); if (gamemode == GAME_GOODVSBAD2) @@ -765,17 +769,17 @@ static void M_SinglePlayer_Draw (void) { int f; - M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl"); + M_DrawPic ( (320-Draw_GetPicWidth(p))/2, 4, "gfx/ttl_sgl"); M_DrawPic (72, 32, "gfx/sp_menu"); - f = (int)(realtime * 10)%6; + f = (int)(host.realtime * 10)%6; - M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i", f+1)); + M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va(vabuf, sizeof(vabuf), "gfx/menudot%i", f+1)); } } -static void M_SinglePlayer_Key (int key, int ascii) +static void M_SinglePlayer_Key(cmd_state_t *cmd, int key, int ascii) { if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { @@ -787,7 +791,7 @@ static void M_SinglePlayer_Key (int key, int ascii) switch (key) { case K_ESCAPE: - M_Menu_Main_f (); + M_Menu_Main_f(cmd); break; case K_DOWNARROW: @@ -810,25 +814,25 @@ static void M_SinglePlayer_Key (int key, int ascii) case 0: key_dest = key_game; if (sv.active) - Cbuf_AddText ("disconnect\n"); - Cbuf_AddText ("maxplayers 1\n"); - Cbuf_AddText ("deathmatch 0\n"); - Cbuf_AddText ("coop 0\n"); + Cbuf_AddText(cmd, "disconnect\n"); + Cbuf_AddText(cmd, "maxplayers 1\n"); + Cbuf_AddText(cmd, "deathmatch 0\n"); + Cbuf_AddText(cmd, "coop 0\n"); if (gamemode == GAME_TRANSFUSION) { key_dest = key_menu; - M_Menu_Transfusion_Episode_f (); + M_Menu_Transfusion_Episode_f(cmd); break; } - Cbuf_AddText ("startmap_sp\n"); + Cbuf_AddText(cmd, "startmap_sp\n"); break; case 1: - M_Menu_Load_f (); + M_Menu_Load_f(cmd); break; case 2: - M_Menu_Save_f (); + M_Menu_Save_f(cmd); break; } } @@ -866,10 +870,10 @@ static void M_ScanSaves (void) buf[len] = 0; t = buf; // version - COM_ParseToken_Simple(&t, false, false); + COM_ParseToken_Simple(&t, false, false, true); //version = atoi(com_token); // description - COM_ParseToken_Simple(&t, false, false); + COM_ParseToken_Simple(&t, false, false, true); strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i])); // change _ back to space @@ -881,7 +885,7 @@ static void M_ScanSaves (void) } } -void M_Menu_Load_f (void) +void M_Menu_Load_f(cmd_state_t *cmd) { m_entersound = true; m_state = m_load; @@ -890,12 +894,12 @@ void M_Menu_Load_f (void) } -void M_Menu_Save_f (void) +void M_Menu_Save_f(cmd_state_t *cmd) { if (!sv.active) return; #if 1 - // LordHavoc: allow saving multiplayer games + // LadyHavoc: allow saving multiplayer games if (cl.islocalgame && cl.intermission) return; #else @@ -919,13 +923,13 @@ static void M_Load_Draw (void) M_Background(320, 200); p = Draw_CachePic ("gfx/p_load"); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load" ); + M_DrawPic ( (320-Draw_GetPicWidth(p))/2, 4, "gfx/p_load" ); for (i=0 ; i< MAX_SAVEGAMES; i++) M_Print(16, 32 + 8*i, m_filenames[i]); // line cursor - M_DrawCharacter (8, 32 + load_cursor*8, 12+((int)(realtime*4)&1)); + M_DrawCharacter (8, 32 + load_cursor*8, 12+((int)(host.realtime*4)&1)); } @@ -937,25 +941,26 @@ static void M_Save_Draw (void) M_Background(320, 200); p = Draw_CachePic ("gfx/p_save"); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save"); + M_DrawPic ( (320-Draw_GetPicWidth(p))/2, 4, "gfx/p_save"); for (i=0 ; iwidth/2, 40, "gfx/menu/tb-episodes"); + M_DrawPic (640/2 - Draw_GetPicWidth(p)/2, 40, "gfx/menu/tb-episodes"); for (y = 0; y < EPISODE_ITEMS; y++){ - M_DrawPic (0, 160 + y * 40, va("gfx/menu/episode%i", y+1)); + M_DrawPic (0, 160 + y * 40, va(vabuf, sizeof(vabuf), "gfx/menu/episode%i", y+1)); } - M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/menu/episode%iselected", m_episode_cursor + 1)); + M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va(vabuf, sizeof(vabuf), "gfx/menu/episode%iselected", m_episode_cursor + 1)); } -static void M_Transfusion_Episode_Key (int key, int ascii) +static void M_Transfusion_Episode_Key(cmd_state_t *cmd, int key, int ascii) { switch (key) { case K_ESCAPE: - M_Menu_Main_f (); + M_Menu_Main_f(cmd); break; case K_DOWNARROW: @@ -1074,9 +1081,9 @@ static void M_Transfusion_Episode_Key (int key, int ascii) break; case K_ENTER: - Cbuf_AddText ("deathmatch 0\n"); + Cbuf_AddText(cmd, "deathmatch 0\n"); m_entersound = true; - M_Menu_Transfusion_Skill_f (); + M_Menu_Transfusion_Skill_f(cmd); } } @@ -1086,7 +1093,7 @@ static void M_Transfusion_Episode_Key (int key, int ascii) static int m_skill_cursor = 2; #define SKILL_ITEMS 5 -void M_Menu_Transfusion_Skill_f (void) +void M_Menu_Transfusion_Skill_f(cmd_state_t *cmd) { m_entersound = true; m_state = m_transfusion_skill; @@ -1097,24 +1104,25 @@ static void M_Transfusion_Skill_Draw (void) { int y; cachepic_t *p; + char vabuf[1024]; M_Background(640, 480); p = Draw_CachePic ("gfx/menu/tb-difficulty"); - M_DrawPic(640/2 - p->width/2, 40, "gfx/menu/tb-difficulty"); + M_DrawPic(640/2 - Draw_GetPicWidth(p)/2, 40, "gfx/menu/tb-difficulty"); for (y = 0; y < SKILL_ITEMS; y++) { - M_DrawPic (0, 180 + y * 40, va("gfx/menu/difficulty%i", y+1)); + M_DrawPic (0, 180 + y * 40, va(vabuf, sizeof(vabuf), "gfx/menu/difficulty%i", y+1)); } - M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va("gfx/menu/difficulty%iselected", m_skill_cursor + 1)); + M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va(vabuf, sizeof(vabuf), "gfx/menu/difficulty%iselected", m_skill_cursor + 1)); } -static void M_Transfusion_Skill_Key (int key, int ascii) +static void M_Transfusion_Skill_Key(cmd_state_t *cmd, int key, int ascii) { switch (key) { case K_ESCAPE: - M_Menu_Transfusion_Episode_f (); + M_Menu_Transfusion_Episode_f(cmd); break; case K_DOWNARROW: @@ -1136,46 +1144,46 @@ static void M_Transfusion_Skill_Key (int key, int ascii) switch (m_skill_cursor) { case 0: - Cbuf_AddText ("skill 1\n"); + Cbuf_AddText(cmd, "skill 1\n"); break; case 1: - Cbuf_AddText ("skill 2\n"); + Cbuf_AddText(cmd, "skill 2\n"); break; case 2: - Cbuf_AddText ("skill 3\n"); + Cbuf_AddText(cmd, "skill 3\n"); break; case 3: - Cbuf_AddText ("skill 4\n"); + Cbuf_AddText(cmd, "skill 4\n"); break; case 4: - Cbuf_AddText ("skill 5\n"); + Cbuf_AddText(cmd, "skill 5\n"); break; } key_dest = key_game; if (sv.active) - Cbuf_AddText ("disconnect\n"); - Cbuf_AddText ("maxplayers 1\n"); - Cbuf_AddText ("deathmatch 0\n"); - Cbuf_AddText ("coop 0\n"); + Cbuf_AddText(cmd, "disconnect\n"); + Cbuf_AddText(cmd, "maxplayers 1\n"); + Cbuf_AddText(cmd, "deathmatch 0\n"); + Cbuf_AddText(cmd, "coop 0\n"); switch (m_episode_cursor) { case 0: - Cbuf_AddText ("map e1m1\n"); + Cbuf_AddText(cmd, "map e1m1\n"); break; case 1: - Cbuf_AddText ("map e2m1\n"); + Cbuf_AddText(cmd, "map e2m1\n"); break; case 2: - Cbuf_AddText ("map e3m1\n"); + Cbuf_AddText(cmd, "map e3m1\n"); break; case 3: - Cbuf_AddText ("map e4m1\n"); + Cbuf_AddText(cmd, "map e4m1\n"); break; case 4: - Cbuf_AddText ("map e6m1\n"); + Cbuf_AddText(cmd, "map e6m1\n"); break; case 5: - Cbuf_AddText ("map cp01\n"); + Cbuf_AddText(cmd, "map cp01\n"); break; } } @@ -1187,7 +1195,7 @@ static int m_multiplayer_cursor; #define MULTIPLAYER_ITEMS 3 -void M_Menu_MultiPlayer_f (void) +void M_Menu_MultiPlayer_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_multiplayer; @@ -1199,36 +1207,37 @@ static void M_MultiPlayer_Draw (void) { int f; cachepic_t *p; + char vabuf[1024]; if (gamemode == GAME_TRANSFUSION) { M_Background(640, 480); p = Draw_CachePic ("gfx/menu/tb-online"); - M_DrawPic (640/2 - p->width/2, 140, "gfx/menu/tb-online"); + M_DrawPic (640/2 - Draw_GetPicWidth(p)/2, 140, "gfx/menu/tb-online"); for (f = 1; f <= MULTIPLAYER_ITEMS; f++) - 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)); + M_DrawPic (0, 180 + f*40, va(vabuf, sizeof(vabuf), "gfx/menu/online%i", f)); + M_DrawPic (0, 220 + m_multiplayer_cursor * 40, va(vabuf, sizeof(vabuf), "gfx/menu/online%iselected", m_multiplayer_cursor + 1)); return; } M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/p_multi"); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); + M_DrawPic ( (320-Draw_GetPicWidth(p))/2, 4, "gfx/p_multi"); M_DrawPic (72, 32, "gfx/mp_menu"); - f = (int)(realtime * 10)%6; + f = (int)(host.realtime * 10)%6; - M_DrawPic (54, 32 + m_multiplayer_cursor * 20, va("gfx/menudot%i", f+1)); + M_DrawPic (54, 32 + m_multiplayer_cursor * 20, va(vabuf, sizeof(vabuf), "gfx/menudot%i", f+1)); } -static void M_MultiPlayer_Key (int key, int ascii) +static void M_MultiPlayer_Key(cmd_state_t *cmd, int key, int ascii) { switch (key) { case K_ESCAPE: - M_Menu_Main_f (); + M_Menu_Main_f(cmd); break; case K_DOWNARROW: @@ -1249,11 +1258,11 @@ static void M_MultiPlayer_Key (int key, int ascii) { case 0: case 1: - M_Menu_LanConfig_f (); + M_Menu_LanConfig_f(cmd); break; case 2: - M_Menu_Setup_f (); + M_Menu_Setup_f(cmd); break; } } @@ -1275,14 +1284,17 @@ static int setup_oldrate; #define NUM_SETUP_CMDS 5 -void M_Menu_Setup_f (void) +extern cvar_t cl_topcolor; +extern cvar_t cl_bottomcolor; + +void M_Menu_Setup_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_setup; m_entersound = true; strlcpy(setup_myname, cl_name.string, sizeof(setup_myname)); - setup_top = setup_oldtop = cl_color.integer >> 4; - setup_bottom = setup_oldbottom = cl_color.integer & 15; + setup_top = setup_oldtop = cl_topcolor.integer; + setup_bottom = setup_oldbottom = cl_bottomcolor.integer; setup_rate = cl_rate.integer; } @@ -1327,12 +1339,13 @@ static void M_Setup_Draw (void) { int i, j; cachepic_t *p; + char vabuf[1024]; M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/p_multi"); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); + M_DrawPic ( (320-Draw_GetPicWidth(p))/2, 4, "gfx/p_multi"); M_Print(64, 40, "Your name"); M_DrawTextBox (160, 32, 16, 1); @@ -1345,12 +1358,12 @@ static void M_Setup_Draw (void) } M_Print(64, 124-8, "Network speed limit"); - M_Print(168, 124, va("%i (%s)", setup_rate, setup_ratetable[setup_rateindex(setup_rate)].name)); + M_Print(168, 124, va(vabuf, sizeof(vabuf), "%i (%s)", setup_rate, setup_ratetable[setup_rateindex(setup_rate)].name)); M_DrawTextBox (64, 140-8, 14, 1); M_Print(72, 140, "Accept Changes"); - // LordHavoc: rewrote this code greatly + // LadyHavoc: rewrote this code greatly if (menuplyr_load) { unsigned char *f; @@ -1403,27 +1416,28 @@ static void M_Setup_Draw (void) } menuplyr_translated[i] = palette_bgra_transparent[j]; } - Draw_NewPic("gfx/menuplyr", menuplyr_width, menuplyr_height, true, (unsigned char *)menuplyr_translated); + Draw_NewPic("gfx/menuplyr", menuplyr_width, menuplyr_height, (unsigned char *)menuplyr_translated, TEXTYPE_BGRA, TEXF_CLAMP); } M_DrawPic(160, 48, "gfx/bigbox"); M_DrawPic(172, 56, "gfx/menuplyr"); } if (setup_cursor == 0) - M_DrawCharacter (168 + 8*strlen(setup_myname), setup_cursor_table [setup_cursor], 10+((int)(realtime*4)&1)); + M_DrawCharacter (168 + 8*strlen(setup_myname), setup_cursor_table [setup_cursor], 10+((int)(host.realtime*4)&1)); else - M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(realtime*4)&1)); + M_DrawCharacter (56, setup_cursor_table [setup_cursor], 12+((int)(host.realtime*4)&1)); } -static void M_Setup_Key (int k, int ascii) +static void M_Setup_Key(cmd_state_t *cmd, int k, int ascii) { int l; + char vabuf[1024]; switch (k) { case K_ESCAPE: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case K_UPARROW: @@ -1483,14 +1497,14 @@ forward: // setup_cursor == 4 (Accept changes) if (strcmp(cl_name.string, setup_myname) != 0) - Cbuf_AddText ( va ("name \"%s\"\n", setup_myname) ); + Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "name \"%s\"\n", setup_myname) ); if (setup_top != setup_oldtop || setup_bottom != setup_oldbottom) - Cbuf_AddText( va ("color %i %i\n", setup_top, setup_bottom) ); + Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "color %i %i\n", setup_top, setup_bottom) ); if (setup_rate != setup_oldrate) - Cbuf_AddText(va("rate %i\n", setup_rate)); + Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "rate %i\n", setup_rate)); m_entersound = true; - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case K_BACKSPACE: @@ -1563,14 +1577,14 @@ static void M_DrawCheckbox (int x, int y, int on) static int options_cursor; -void M_Menu_Options_f (void) +void M_Menu_Options_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_options; m_entersound = true; } -extern cvar_t slowmo; +extern cvar_t host_timescale; extern dllhandle_t jpeg_dll; extern cvar_t gl_texture_anisotropy; extern cvar_t r_textshadow; @@ -1604,8 +1618,8 @@ static void M_Menu_Options_AdjustSliders (int dir) Cvar_SetValueQuick (&cl_backspeed, 400); } } - else if (options_cursor == optnum++) Cvar_SetValueQuick(&showfps, !showfps.integer); - else if (options_cursor == optnum++) {f = !(showdate.integer && showtime.integer);Cvar_SetValueQuick(&showdate, f);Cvar_SetValueQuick(&showtime, f);} + else if (options_cursor == optnum++) Cvar_SetValueQuick(&cl_showfps, !cl_showfps.integer); + else if (options_cursor == optnum++) {f = !(cl_showdate.integer && cl_showtime.integer);Cvar_SetValueQuick(&cl_showdate, f);Cvar_SetValueQuick(&cl_showtime, f);} else if (options_cursor == optnum++) ; else if (options_cursor == optnum++) Cvar_SetValueQuick(&r_hdr_scenebrightness, bound(1, r_hdr_scenebrightness.value + dir * 0.0625, 4)); else if (options_cursor == optnum++) Cvar_SetValueQuick(&v_contrast, bound(1, v_contrast.value + dir * 0.0625, 4)); @@ -1614,46 +1628,46 @@ static void M_Menu_Options_AdjustSliders (int dir) else if (options_cursor == optnum++) Cvar_SetValueQuick(&bgmvolume, bound(0, bgmvolume.value + dir * 0.0625, 1)); } -static int optnum; -static int opty; -static int optcursor; +static int m_optnum; +static int m_opty; +static int m_optcursor; static void M_Options_PrintCommand(const char *s, int enabled) { - if (opty >= 32) + if (m_opty >= 32) { - if (optnum == optcursor) - DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); - M_ItemPrint(0 + 48, opty, s, enabled); + if (m_optnum == m_optcursor) + DrawQ_Fill(menu_x + 48, menu_y + m_opty, 320, 8, m_optnum == m_optcursor ? (0.5 + 0.2 * sin(host.realtime * M_PI)) : 0, 0, 0, 0.5, 0); + M_ItemPrint(0 + 48, m_opty, s, enabled); } - opty += 8; - optnum++; + m_opty += 8; + m_optnum++; } static void M_Options_PrintCheckbox(const char *s, int enabled, int yes) { - if (opty >= 32) + if (m_opty >= 32) { - if (optnum == optcursor) - DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); - M_ItemPrint(0 + 48, opty, s, enabled); - M_DrawCheckbox(0 + 48 + (int)strlen(s) * 8 + 8, opty, yes); + if (m_optnum == m_optcursor) + DrawQ_Fill(menu_x + 48, menu_y + m_opty, 320, 8, m_optnum == m_optcursor ? (0.5 + 0.2 * sin(host.realtime * M_PI)) : 0, 0, 0, 0.5, 0); + M_ItemPrint(0 + 48, m_opty, s, enabled); + M_DrawCheckbox(0 + 48 + (int)strlen(s) * 8 + 8, m_opty, yes); } - opty += 8; - optnum++; + m_opty += 8; + m_optnum++; } static void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue) { - if (opty >= 32) + if (m_opty >= 32) { - if (optnum == optcursor) - DrawQ_Fill(menu_x + 48, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); - M_ItemPrint(0 + 48, opty, s, enabled); - M_DrawSlider(0 + 48 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue); + if (m_optnum == m_optcursor) + DrawQ_Fill(menu_x + 48, menu_y + m_opty, 320, 8, m_optnum == m_optcursor ? (0.5 + 0.2 * sin(host.realtime * M_PI)) : 0, 0, 0, 0.5, 0); + M_ItemPrint(0 + 48, m_opty, s, enabled); + M_DrawSlider(0 + 48 + (int)strlen(s) * 8 + 8, m_opty, value, minvalue, maxvalue); } - opty += 8; - optnum++; + m_opty += 8; + m_optnum++; } static void M_Options_Draw (void) @@ -1665,12 +1679,12 @@ static void M_Options_Draw (void) M_DrawPic(16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/p_option"); - M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); + M_DrawPic((320-Draw_GetPicWidth(p))/2, 4, "gfx/p_option"); - optnum = 0; - optcursor = options_cursor; + m_optnum = 0; + m_optcursor = options_cursor; visible = (int)((menu_height - 32) / 8); - opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8; + m_opty = 32 - bound(0, m_optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8; M_Options_PrintCommand( " Customize controls", true); M_Options_PrintCommand( " Go to console", true); @@ -1681,8 +1695,8 @@ static void M_Options_Draw (void) M_Options_PrintCheckbox(" Invert Mouse", true, m_pitch.value < 0); M_Options_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170); M_Options_PrintCheckbox(" Always Run", true, cl_forwardspeed.value > 200); - M_Options_PrintCheckbox(" Show Framerate", true, showfps.integer); - M_Options_PrintCheckbox(" Show Date and Time", true, showdate.integer && showtime.integer); + M_Options_PrintCheckbox(" Show Framerate", true, cl_showfps.integer); + M_Options_PrintCheckbox(" Show Date and Time", true, cl_showdate.integer && cl_showtime.integer); M_Options_PrintCommand( " Custom Brightness", true); M_Options_PrintSlider( " Game Brightness", true, r_hdr_scenebrightness.value, 1, 4); M_Options_PrintSlider( " Brightness", true, v_contrast.value, 1, 2); @@ -1702,12 +1716,12 @@ static void M_Options_Draw (void) } -static void M_Options_Key (int k, int ascii) +static void M_Options_Key(cmd_state_t *cmd, int k, int ascii) { switch (k) { case K_ESCAPE: - M_Menu_Main_f (); + M_Menu_Main_f(cmd); break; case K_ENTER: @@ -1715,51 +1729,51 @@ static void M_Options_Key (int k, int ascii) switch (options_cursor) { case 0: - M_Menu_Keys_f (); + M_Menu_Keys_f(cmd); break; case 1: m_state = m_none; key_dest = key_game; - Con_ToggleConsole_f (); + Con_ToggleConsole_f(cmd); break; case 2: - M_Menu_Reset_f (); + M_Menu_Reset_f(cmd); break; case 3: - M_Menu_Video_f (); + M_Menu_Video_f(cmd); break; case 11: - M_Menu_Options_ColorControl_f (); + M_Menu_Options_ColorControl_f(cmd); break; case 17: // Customize Effects - M_Menu_Options_Effects_f (); + M_Menu_Options_Effects_f(cmd); break; case 18: // Effects: Quake - Cbuf_AddText("cl_particles 1;cl_particles_quake 1;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 0;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 0;cl_beams_polygons 0;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n"); + Cbuf_AddText(cmd, "cl_particles 1;cl_particles_quake 1;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 0;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 0;cl_beams_polygons 0;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n"); break; case 19: // Effects: Normal - Cbuf_AddText("cl_particles 1;cl_particles_quake 0;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n"); + Cbuf_AddText(cmd, "cl_particles 1;cl_particles_quake 0;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n"); break; case 20: // Effects: High - Cbuf_AddText("cl_particles 1;cl_particles_quake 0;cl_particles_quality 2;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 1;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n"); + Cbuf_AddText(cmd, "cl_particles 1;cl_particles_quake 0;cl_particles_quality 2;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 1;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;r_lerplightstyles 0;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n"); break; case 21: - M_Menu_Options_Graphics_f (); + M_Menu_Options_Graphics_f(cmd); break; case 22: // Lighting: Flares - Cbuf_AddText("r_coronas 1;gl_flashblend 1;r_shadow_gloss 0;r_shadow_realtime_dlight 0;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0"); + Cbuf_AddText(cmd, "r_coronas 1;gl_flashblend 1;r_shadow_gloss 0;r_shadow_realtime_dlight 0;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0"); break; case 23: // Lighting: Normal - Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0"); + Cbuf_AddText(cmd, "r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0"); break; case 24: // Lighting: High - Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0"); + Cbuf_AddText(cmd, "r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1"); break; case 25: // Lighting: Full - Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0"); + Cbuf_AddText(cmd, "r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1"); break; case 26: - M_Menu_ModList_f (); + M_Menu_ModList_f(cmd); break; default: M_Menu_Options_AdjustSliders (1); @@ -1795,7 +1809,7 @@ static void M_Options_Key (int k, int ascii) static int options_effects_cursor; -void M_Menu_Options_Effects_f (void) +void M_Menu_Options_Effects_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_options_effects; @@ -1872,12 +1886,12 @@ static void M_Options_Effects_Draw (void) M_DrawPic(16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/p_option"); - M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); + M_DrawPic((320-Draw_GetPicWidth(p))/2, 4, "gfx/p_option"); - optcursor = options_effects_cursor; - optnum = 0; + m_optcursor = options_effects_cursor; + m_optnum = 0; visible = (int)((menu_height - 32) / 8); - opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8; + m_opty = 32 - bound(0, m_optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8; M_Options_PrintCheckbox(" Particles", true, cl_particles.integer); M_Options_PrintCheckbox(" Quake-style Particles", true, cl_particles_quake.integer); @@ -1917,12 +1931,12 @@ static void M_Options_Effects_Draw (void) } -static void M_Options_Effects_Key (int k, int ascii) +static void M_Options_Effects_Key(cmd_state_t *cmd, int k, int ascii) { switch (k) { case K_ESCAPE: - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case K_ENTER: @@ -1958,7 +1972,7 @@ static void M_Options_Effects_Key (int k, int ascii) static int options_graphics_cursor; -void M_Menu_Options_Graphics_f (void) +void M_Menu_Options_Graphics_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_options_graphics; @@ -1978,13 +1992,11 @@ extern cvar_t r_bloom_colorexponent; extern cvar_t r_bloom_blur; extern cvar_t r_bloom_brighten; extern cvar_t r_bloom_resolution; -extern cvar_t r_hdr; extern cvar_t r_hdr_scenebrightness; extern cvar_t r_hdr_glowintensity; -extern cvar_t r_hdr_range; extern cvar_t gl_picmip; -static void M_Menu_Options_Graphics_AdjustSliders (int dir) +static void M_Menu_Options_Graphics_AdjustSliders (cmd_state_t *cmd, int dir) { int optnum; S_LocalSound ("sound/misc/menu3.wav"); @@ -1999,10 +2011,8 @@ static void M_Menu_Options_Graphics_AdjustSliders (int dir) else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world, !r_shadow_realtime_world.integer); else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps, bound(0, r_shadow_realtime_world_lightmaps.value + dir * 0.1, 1)); else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_shadows, !r_shadow_realtime_world_shadows.integer); - else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_scenebrightness, bound(0.25, r_hdr_scenebrightness.value + dir * 0.125, 4)); else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom, !r_bloom.integer); - else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr, !r_hdr.integer); - else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_range, bound(1, r_hdr_range.value + dir * 0.25, 16)); + else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_scenebrightness, bound(0.25, r_hdr_scenebrightness.value + dir * 0.125, 4)); else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_glowintensity, bound(0, r_hdr_glowintensity.value + dir * 0.25, 4)); else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorscale, bound(0.0625, r_bloom_colorscale.value + dir * 0.0625, 1)); else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorsubtract, bound(0, r_bloom_colorsubtract.value + dir * 0.0625, 1-0.0625)); @@ -2010,7 +2020,7 @@ static void M_Menu_Options_Graphics_AdjustSliders (int dir) else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_brighten, bound(1, r_bloom_brighten.value + dir * 0.0625, 4)); 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++) Cbuf_AddText ("r_restart\n"); + else if (options_graphics_cursor == optnum++) Cbuf_AddText(cmd, "r_restart\n"); } @@ -2023,12 +2033,12 @@ static void M_Options_Graphics_Draw (void) M_DrawPic(16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/p_option"); - M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); + M_DrawPic((320-Draw_GetPicWidth(p))/2, 4, "gfx/p_option"); - optcursor = options_graphics_cursor; - optnum = 0; + m_optcursor = options_graphics_cursor; + m_optnum = 0; visible = (int)((menu_height - 32) / 8); - opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8; + m_opty = 32 - bound(0, m_optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8; M_Options_PrintSlider( " Corona Intensity", true, r_coronas.value, 0, 4); M_Options_PrintCheckbox(" Use Only Coronas", true, gl_flashblend.integer); @@ -2038,31 +2048,29 @@ static void M_Options_Graphics_Draw (void) M_Options_PrintCheckbox(" RT World", true, r_shadow_realtime_world.integer); M_Options_PrintSlider( " RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1); M_Options_PrintCheckbox(" RT World Shadow", true, r_shadow_realtime_world_shadows.integer); + M_Options_PrintCheckbox(" Bloom Effect", true, r_bloom.integer); M_Options_PrintSlider( " Scene Brightness", true, r_hdr_scenebrightness.value, 0.25, 4); - M_Options_PrintCheckbox(" Bloom Effect", !r_hdr.integer, r_bloom.integer); - M_Options_PrintCheckbox(" HDR Bloom Effect", true, r_hdr.integer); - M_Options_PrintSlider( " HDR Dynamic Range", r_hdr.integer, r_hdr_range.value, 1, 16); - M_Options_PrintSlider( " HDR Glow Intensity", r_hdr.integer, r_hdr_glowintensity.value, 0, 4); - M_Options_PrintSlider( " Bloom Color Scale", r_hdr.integer || r_bloom.integer, r_bloom_colorscale.value, 0.0625, 1); - M_Options_PrintSlider( " Bloom Color Subtract", r_hdr.integer || r_bloom.integer, r_bloom_colorsubtract.value, 0, 1-0.0625); - M_Options_PrintSlider( " Bloom Color Exponent", r_hdr.integer || r_bloom.integer, r_bloom_colorexponent.value, 1, 8); - M_Options_PrintSlider( " Bloom Intensity", r_hdr.integer || r_bloom.integer, r_bloom_brighten.value, 1, 4); - M_Options_PrintSlider( " Bloom Blur", r_hdr.integer || r_bloom.integer, r_bloom_blur.value, 1, 16); - M_Options_PrintSlider( " Bloom Resolution", r_hdr.integer || r_bloom.integer, r_bloom_resolution.value, 64, 2048); + M_Options_PrintSlider( " Glow Brightness", true, r_hdr_glowintensity.value, 0, 4); + M_Options_PrintSlider( " Bloom Color Scale", r_bloom.integer, r_bloom_colorscale.value, 0.0625, 1); + M_Options_PrintSlider( " Bloom Color Subtract", r_bloom.integer, r_bloom_colorsubtract.value, 0, 1-0.0625); + M_Options_PrintSlider( " Bloom Color Exponent", r_bloom.integer, r_bloom_colorexponent.value, 1, 8); + M_Options_PrintSlider( " Bloom Intensity", r_bloom.integer, r_bloom_brighten.value, 1, 4); + M_Options_PrintSlider( " Bloom Blur", r_bloom.integer, r_bloom_blur.value, 1, 16); + M_Options_PrintSlider( " Bloom Resolution", r_bloom.integer, r_bloom_resolution.value, 64, 2048); M_Options_PrintCommand( " Restart Renderer", true); } -static void M_Options_Graphics_Key (int k, int ascii) +static void M_Options_Graphics_Key (cmd_state_t *cmd, int k, int ascii) { switch (k) { case K_ESCAPE: - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case K_ENTER: - M_Menu_Options_Graphics_AdjustSliders (1); + M_Menu_Options_Graphics_AdjustSliders (cmd, 1); break; case K_UPARROW: @@ -2080,11 +2088,11 @@ static void M_Options_Graphics_Key (int k, int ascii) break; case K_LEFTARROW: - M_Menu_Options_Graphics_AdjustSliders (-1); + M_Menu_Options_Graphics_AdjustSliders(cmd, -1); break; case K_RIGHTARROW: - M_Menu_Options_Graphics_AdjustSliders (1); + M_Menu_Options_Graphics_AdjustSliders(cmd, 1); break; } } @@ -2095,9 +2103,9 @@ static void M_Options_Graphics_Key (int k, int ascii) static int options_colorcontrol_cursor; // intensity value to match up to 50% dither to 'correct' quake -static cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.5", "intensity value that matches up to white/black dither pattern, should be 0.5 for linear color"}; +static cvar_t menu_options_colorcontrol_correctionvalue = {CF_CLIENT, "menu_options_colorcontrol_correctionvalue", "0.5", "intensity value that matches up to white/black dither pattern, should be 0.5 for linear color"}; -void M_Menu_Options_ColorControl_f (void) +void M_Menu_Options_ColorControl_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_options_colorcontrol; @@ -2113,8 +2121,6 @@ static void M_Menu_Options_ColorControl_AdjustSliders (int dir) optnum = 1; if (options_colorcontrol_cursor == optnum++) - Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer); - else if (options_colorcontrol_cursor == optnum++) { Cvar_SetValueQuick (&v_color_enable, 0); Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.125, 5)); @@ -2207,7 +2213,8 @@ static void M_Menu_Options_ColorControl_AdjustSliders (int dir) static void M_Options_ColorControl_Draw (void) { int visible; - float x, c, s, t, u, v; + float x, s, t, u, v; + float c[3]; cachepic_t *p, *dither; dither = Draw_CachePic_Flags ("gfx/colorcontrol/ditherpattern", CACHEPICFLAG_NOCLAMP); @@ -2216,16 +2223,15 @@ static void M_Options_ColorControl_Draw (void) M_DrawPic(16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/p_option"); - M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); + M_DrawPic((320-Draw_GetPicWidth(p))/2, 4, "gfx/p_option"); - optcursor = options_colorcontrol_cursor; - optnum = 0; + m_optcursor = options_colorcontrol_cursor; + m_optnum = 0; visible = (int)((menu_height - 32) / 8); - opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_COLORCONTROL_ITEMS - visible)) * 8; + m_opty = 32 - bound(0, m_optcursor - (visible >> 1), max(0, OPTIONS_COLORCONTROL_ITEMS - visible)) * 8; M_Options_PrintCommand( " Reset to defaults", true); - M_Options_PrintCheckbox("Hardware Gamma Control", vid_hardwaregammasupported.integer, v_hwgamma.integer); - M_Options_PrintSlider( " Gamma", !v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_gamma.value, 1, 5); + M_Options_PrintSlider( " Gamma", !v_color_enable.integer, v_gamma.value, 1, 5); M_Options_PrintSlider( " Contrast", !v_color_enable.integer, v_contrast.value, 1, 5); M_Options_PrintSlider( " Brightness", !v_color_enable.integer, v_brightness.value, 0, 0.8); M_Options_PrintCheckbox(" Color Level Controls", true, v_color_enable.integer); @@ -2233,59 +2239,62 @@ static void M_Options_ColorControl_Draw (void) M_Options_PrintSlider( " Black: Green", v_color_enable.integer, v_color_black_g.value, 0, 0.8); M_Options_PrintSlider( " Black: Blue ", v_color_enable.integer, v_color_black_b.value, 0, 0.8); M_Options_PrintSlider( " Black: Grey ", v_color_enable.integer, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3, 0, 0.8); - M_Options_PrintSlider( " Grey: Red ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_r.value, 0, 0.95); - M_Options_PrintSlider( " Grey: Green", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_g.value, 0, 0.95); - M_Options_PrintSlider( " Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, v_color_grey_b.value, 0, 0.95); - M_Options_PrintSlider( " Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported.integer && v_hwgamma.integer, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3, 0, 0.95); + M_Options_PrintSlider( " Grey: Red ", v_color_enable.integer, v_color_grey_r.value, 0, 0.95); + M_Options_PrintSlider( " Grey: Green", v_color_enable.integer, v_color_grey_g.value, 0, 0.95); + M_Options_PrintSlider( " Grey: Blue ", v_color_enable.integer, v_color_grey_b.value, 0, 0.95); + M_Options_PrintSlider( " Grey: Grey ", v_color_enable.integer, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3, 0, 0.95); M_Options_PrintSlider( " White: Red ", v_color_enable.integer, v_color_white_r.value, 1, 5); M_Options_PrintSlider( " White: Green", v_color_enable.integer, v_color_white_g.value, 1, 5); M_Options_PrintSlider( " White: Blue ", v_color_enable.integer, v_color_white_b.value, 1, 5); 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; + m_opty += 4; + DrawQ_Fill(menu_x, menu_y + m_opty, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);m_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 + DrawQ_SuperPic(menu_x + 4, menu_y + m_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);m_opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + m_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);m_opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + m_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);m_opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + m_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);m_opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + m_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);m_opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + m_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);m_opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + m_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);m_opty += 4; + DrawQ_SuperPic(menu_x + 4, menu_y + m_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);m_opty += 4; + + c[0] = menu_options_colorcontrol_correctionvalue.value; // intensity value that should be matched up to a 50% dither to 'correct' quake + c[1] = c[0]; + c[2] = c[1]; + VID_ApplyGammaToColor(c, c); 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; + m_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, 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); + DrawQ_Fill(menu_x + x, menu_y + m_opty, 64, 48, c[0], 0, 0, 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + m_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 + m_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, 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); + DrawQ_Fill(menu_x + x, menu_y + m_opty, 64, 48, 0, c[1], 0, 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + m_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 + m_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, 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); + DrawQ_Fill(menu_x + x, menu_y + m_opty, 64, 48, 0, 0, c[2], 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + m_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 + m_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, 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); + DrawQ_Fill(menu_x + x, menu_y + m_opty, 64, 48, c[0], c[1], c[2], 1, 0); + DrawQ_SuperPic(menu_x + x + 16, menu_y + m_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 + m_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); } -static void M_Options_ColorControl_Key (int k, int ascii) +static void M_Options_ColorControl_Key(cmd_state_t *cmd, int k, int ascii) { switch (k) { case K_ESCAPE: - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case K_ENTER: @@ -2293,7 +2302,6 @@ static void M_Options_ColorControl_Key (int k, int ascii) switch (options_colorcontrol_cursor) { case 0: - Cvar_SetValueQuick(&v_hwgamma, 1); Cvar_SetValueQuick(&v_gamma, 1); Cvar_SetValueQuick(&v_contrast, 1); Cvar_SetValueQuick(&v_brightness, 0); @@ -2543,7 +2551,7 @@ static void M_DefaultBinds (void) static int keys_cursor; static int bind_grab; -void M_Menu_Keys_f (void) +void M_Menu_Keys_f(cmd_state_t *cmd) { key_dest = key_menu_grabbed; m_state = m_keys; @@ -2606,7 +2614,7 @@ static void M_Keys_Draw (void) M_Background(320, 48 + 8 * numcommands); p = Draw_CachePic ("gfx/ttl_cstm"); - M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm"); + M_DrawPic ( (320-Draw_GetPicWidth(p))/2, 4, "gfx/ttl_cstm"); if (bind_grab) M_Print(12, 32, "Press a key or button for this action"); @@ -2630,11 +2638,12 @@ static void M_Keys_Draw (void) Key_FindKeysForCommand (bindnames[i][0], keys, NUMKEYS, 0); - // LordHavoc: redesigned to print more than 2 keys, inspired by Tomaz's MiniRacer + // LadyHavoc: redesigned to print more than 2 keys, inspired by Tomaz's MiniRacer if (keys[0] == -1) strlcpy(keystring, "???", sizeof(keystring)); else { + char tinystr[2]; keystring[0] = 0; for (j = 0;j < NUMKEYS;j++) { @@ -2642,7 +2651,7 @@ static void M_Keys_Draw (void) { if (j > 0) strlcat(keystring, " or ", sizeof(keystring)); - strlcat(keystring, Key_KeynumToString (keys[j]), sizeof(keystring)); + strlcat(keystring, Key_KeynumToString (keys[j], tinystr, sizeof(tinystr)), sizeof(keystring)); } } } @@ -2652,14 +2661,15 @@ static void M_Keys_Draw (void) if (bind_grab) M_DrawCharacter (140, 48 + keys_cursor*8, '='); else - M_DrawCharacter (140, 48 + keys_cursor*8, 12+((int)(realtime*4)&1)); + M_DrawCharacter (140, 48 + keys_cursor*8, 12+((int)(host.realtime*4)&1)); } -static void M_Keys_Key (int k, int ascii) +static void M_Keys_Key(cmd_state_t *cmd, int k, int ascii) { - char cmd[80]; + char line[80]; int keys[NUMKEYS]; + char tinystr[2]; if (bind_grab) { // defining a key @@ -2670,8 +2680,8 @@ static void M_Keys_Key (int k, int ascii) } else //if (k != '`') { - dpsnprintf (cmd, sizeof(cmd), "bind \"%s\" \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor][0]); - Cbuf_InsertText (cmd); + dpsnprintf(line, sizeof(line), "bind \"%s\" \"%s\"\n", Key_KeynumToString(k, tinystr, sizeof(tinystr)), bindnames[keys_cursor][0]); + Cbuf_InsertText (cmd, line); } bind_grab = false; @@ -2681,7 +2691,7 @@ static void M_Keys_Key (int k, int ascii) switch (k) { case K_ESCAPE: - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case K_LEFTARROW: @@ -2724,7 +2734,7 @@ static void M_Keys_Key (int k, int ascii) } } -void M_Menu_Reset_f (void) +void M_Menu_Reset_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_reset; @@ -2732,13 +2742,13 @@ void M_Menu_Reset_f (void) } -static void M_Reset_Key (int key, int ascii) +static void M_Reset_Key(cmd_state_t *cmd, int key, int ascii) { switch (key) { case 'Y': case 'y': - Cbuf_AddText ("cvar_resettodefaults_all;exec default.cfg\n"); + Cbuf_AddText(cmd, "cvar_resettodefaults_all;exec default.cfg\n"); // no break here since we also exit the menu case K_ESCAPE: @@ -2828,9 +2838,9 @@ video_resolution_t video_resolutions_hardcoded[] = // this is the number of the default mode (640x480) in the list above int video_resolutions_hardcoded_count = sizeof(video_resolutions_hardcoded) / sizeof(*video_resolutions_hardcoded) - 1; -#define VIDEO_ITEMS 11 +#define VIDEO_ITEMS 10 static int video_cursor = 0; -static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152, 168}; +static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152}; static int menu_video_resolution; video_resolution_t *video_resolutions; @@ -2838,7 +2848,7 @@ int video_resolutions_count; static video_resolution_t *menu_video_resolutions; static int menu_video_resolutions_count; -static qboolean menu_video_resolutions_forfullscreen; +static qbool menu_video_resolutions_forfullscreen; static void M_Menu_Video_FindResolution(int w, int h, float a) { @@ -2872,7 +2882,7 @@ static void M_Menu_Video_FindResolution(int w, int h, float a) if (menu_video_resolutions[i].height == h && menu_video_resolutions[menu_video_resolution].height == h) { // if the new mode would be a worse match in pixel aspect, skip it - if (abs(menu_video_resolutions[i].pixelheight - a) > abs(menu_video_resolutions[menu_video_resolution].pixelheight - a)) + if (fabs(menu_video_resolutions[i].pixelheight - a) > fabs(menu_video_resolutions[menu_video_resolution].pixelheight - a)) continue; // if it is equal in everything, skip it (prefer earlier modes) if (menu_video_resolutions[i].pixelheight == a && menu_video_resolutions[menu_video_resolution].pixelheight == a) @@ -2888,7 +2898,7 @@ static void M_Menu_Video_FindResolution(int w, int h, float a) } } -void M_Menu_Video_f (void) +void M_Menu_Video_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_video; @@ -2902,6 +2912,7 @@ static void M_Video_Draw (void) { int t; cachepic_t *p; + char vabuf[1024]; if(!!vid_fullscreen.integer != menu_video_resolutions_forfullscreen) { @@ -2914,27 +2925,22 @@ static void M_Video_Draw (void) M_DrawPic(16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/vidmodes"); - M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes"); + M_DrawPic((320-Draw_GetPicWidth(p))/2, 4, "gfx/vidmodes"); t = 0; // Current and Proposed Resolution M_Print(16, video_cursor_table[t] - 12, " Current Resolution"); if (vid_supportrefreshrate && vid.userefreshrate && vid.fullscreen) - M_Print(220, video_cursor_table[t] - 12, va("%dx%d %.2fhz", vid.width, vid.height, vid.refreshrate)); + M_Print(220, video_cursor_table[t] - 12, va(vabuf, sizeof(vabuf), "%dx%d %.2fhz", vid.width, vid.height, vid.refreshrate)); else - M_Print(220, video_cursor_table[t] - 12, va("%dx%d", vid.width, vid.height)); + M_Print(220, video_cursor_table[t] - 12, va(vabuf, sizeof(vabuf), "%dx%d", vid.width, vid.height)); M_Print(16, video_cursor_table[t], " New Resolution"); - M_Print(220, video_cursor_table[t], va("%dx%d", menu_video_resolutions[menu_video_resolution].width, menu_video_resolutions[menu_video_resolution].height)); - M_Print(96, video_cursor_table[t] + 8, va("Type: %s", menu_video_resolutions[menu_video_resolution].type)); + M_Print(220, video_cursor_table[t], va(vabuf, sizeof(vabuf), "%dx%d", menu_video_resolutions[menu_video_resolution].width, menu_video_resolutions[menu_video_resolution].height)); + M_Print(96, video_cursor_table[t] + 8, va(vabuf, sizeof(vabuf), "Type: %s", menu_video_resolutions[menu_video_resolution].type)); t++; - // Bits per pixel - M_Print(16, video_cursor_table[t], " Bits per pixel"); - M_Print(220, video_cursor_table[t], (vid_bitsperpixel.integer == 32) ? "32" : "16"); - t++; - - // Bits per pixel + // Antialiasing M_Print(16, video_cursor_table[t], " Antialiasing"); M_DrawSlider(220, video_cursor_table[t], vid_samples.value, 1, 32); t++; @@ -2967,7 +2973,7 @@ static void M_Video_Draw (void) M_DrawSlider(220, video_cursor_table[t], gl_picmip.value, 3, 0); t++; - M_ItemPrint(16, video_cursor_table[t], " Texture Compression", vid.support.arb_texture_compression); + M_ItemPrint(16, video_cursor_table[t], " Texture Compression", true); M_DrawCheckbox(220, video_cursor_table[t], gl_texturecompression.integer); t++; @@ -2976,7 +2982,7 @@ static void M_Video_Draw (void) t++; // Cursor - M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1)); + M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(host.realtime*4)&1)); } @@ -3002,8 +3008,6 @@ static void M_Menu_Video_AdjustSliders (int dir) break; } } - else if (video_cursor == t++) - Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32); else if (video_cursor == t++) Cvar_SetValueQuick (&vid_samples, bound(1, vid_samples.value * (dir > 0 ? 2 : 0.5), 32)); else if (video_cursor == t++) @@ -3023,7 +3027,7 @@ static void M_Menu_Video_AdjustSliders (int dir) } -static void M_Video_Key (int key, int ascii) +static void M_Video_Key(cmd_state_t *cmd, int key, int ascii) { switch (key) { @@ -3037,7 +3041,7 @@ static void M_Video_Key (int key, int ascii) Cvar_SetValueQuick(&vid_userefreshrate, vid.userefreshrate); S_LocalSound ("sound/misc/menu1.wav"); - M_Menu_Options_f (); + M_Menu_Options_f(cmd); break; case K_ENTER: @@ -3050,8 +3054,8 @@ static void M_Video_Key (int key, int ascii) Cvar_SetValueQuick (&vid_conwidth, menu_video_resolutions[menu_video_resolution].conwidth); Cvar_SetValueQuick (&vid_conheight, menu_video_resolutions[menu_video_resolution].conheight); Cvar_SetValueQuick (&vid_pixelheight, menu_video_resolutions[menu_video_resolution].pixelheight); - Cbuf_AddText ("vid_restart\n"); - M_Menu_Options_f (); + Cbuf_AddText(cmd, "vid_restart\n"); + M_Menu_Options_f(cmd); break; default: M_Menu_Video_AdjustSliders (1); @@ -3089,7 +3093,7 @@ static int help_page; #define NUM_HELP_PAGES 6 -void M_Menu_Help_f (void) +void M_Menu_Help_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_help; @@ -3101,17 +3105,18 @@ void M_Menu_Help_f (void) static void M_Help_Draw (void) { + char vabuf[1024]; M_Background(320, 200); - M_DrawPic (0, 0, va("gfx/help%i", help_page)); + M_DrawPic (0, 0, va(vabuf, sizeof(vabuf), "gfx/help%i", help_page)); } -static void M_Help_Key (int key, int ascii) +static void M_Help_Key(cmd_state_t *cmd, int key, int ascii) { switch (key) { case K_ESCAPE: - M_Menu_Main_f (); + M_Menu_Main_f(cmd); break; case K_UPARROW: @@ -3134,7 +3139,7 @@ static void M_Help_Key (int key, int ascii) //============================================================================= /* CEDITS MENU */ -void M_Menu_Credits_f (void) +void M_Menu_Credits_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_credits; @@ -3153,9 +3158,9 @@ static void M_Credits_Draw (void) } -static void M_Credits_Key (int key, int ascii) +static void M_Credits_Key(cmd_state_t *cmd, int key, int ascii) { - M_Menu_Main_f (); + M_Menu_Main_f(cmd); } //============================================================================= @@ -3163,7 +3168,7 @@ static void M_Credits_Key (int key, int ascii) static const char *m_quit_message[9]; static int m_quit_prevstate; -static qboolean wasInMenus; +static qbool wasInMenus; static int M_QuitMessage(const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, const char *line6, const char *line7, const char *line8) @@ -3193,6 +3198,7 @@ static int M_ChooseQuitMessage(int request) case GAME_NORMAL: case GAME_HIPNOTIC: case GAME_ROGUE: + case GAME_QUOTH: 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); @@ -3243,7 +3249,7 @@ static int M_ChooseQuitMessage(int request) return 0; } -void M_Menu_Quit_f (void) +void M_Menu_Quit_f(cmd_state_t *cmd) { int n; if (m_state == m_quit) @@ -3260,7 +3266,7 @@ void M_Menu_Quit_f (void) } -static void M_Quit_Key (int key, int ascii) +static void M_Quit_Key(cmd_state_t *cmd, int key, int ascii) { switch (key) { @@ -3281,7 +3287,7 @@ static void M_Quit_Key (int key, int ascii) case 'Y': case 'y': - Host_Quit_f (); + host.state = host_shutdown; break; default: @@ -3323,7 +3329,7 @@ static int lanConfig_port; static char lanConfig_portname[6]; static char lanConfig_joinname[40]; -void M_Menu_LanConfig_f (void) +void M_Menu_LanConfig_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_lanconfig; @@ -3348,12 +3354,13 @@ static void M_LanConfig_Draw (void) int basex; const char *startJoin; const char *protocol; + char vabuf[1024]; M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/p_multi"); - basex = (320-p->width)/2; + basex = (320-Draw_GetPicWidth(p))/2; M_DrawPic (basex, 4, "gfx/p_multi"); if (StartingGame) @@ -3361,7 +3368,7 @@ static void M_LanConfig_Draw (void) else startJoin = "Join Game"; protocol = "TCP/IP"; - M_Print(basex, 32, va ("%s - %s", startJoin, protocol)); + M_Print(basex, 32, va(vabuf, sizeof(vabuf), "%s - %s", startJoin, protocol)); basex += 8; M_Print(basex, lanConfig_cursor_table[0], "Port"); @@ -3382,27 +3389,28 @@ static void M_LanConfig_Draw (void) M_Print(basex+8, lanConfig_cursor_table[1], "OK"); } - M_DrawCharacter (basex-8, lanConfig_cursor_table [lanConfig_cursor], 12+((int)(realtime*4)&1)); + M_DrawCharacter (basex-8, lanConfig_cursor_table [lanConfig_cursor], 12+((int)(host.realtime*4)&1)); if (lanConfig_cursor == 0) - M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [lanConfig_cursor], 10+((int)(realtime*4)&1)); + M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [lanConfig_cursor], 10+((int)(host.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)); + M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [lanConfig_cursor], 10+((int)(host.realtime*4)&1)); if (*m_return_reason) M_Print(basex, 168, m_return_reason); } -static void M_LanConfig_Key (int key, int ascii) +static void M_LanConfig_Key(cmd_state_t *cmd, int key, int ascii) { int l; + char vabuf[1024]; switch (key) { case K_ESCAPE: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case K_UPARROW: @@ -3431,23 +3439,23 @@ static void M_LanConfig_Key (int key, int ascii) m_entersound = true; - Cbuf_AddText ("stopdemo\n"); + Cbuf_AddText(cmd, "stopdemo\n"); - Cvar_SetValue("port", lanConfig_port); + Cvar_SetValue(&cvars_all, "port", lanConfig_port); if (lanConfig_cursor == 1 || lanConfig_cursor == 2) { if (StartingGame) { - M_Menu_GameOptions_f (); + M_Menu_GameOptions_f(cmd); break; } - M_Menu_ServerList_f(); + M_Menu_ServerList_f(cmd); break; } if (lanConfig_cursor == 3) - Cbuf_AddText ( va ("connect \"%s\"\n", lanConfig_joinname) ); + Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "connect \"%s\"\n", lanConfig_joinname) ); break; case K_BACKSPACE: @@ -3926,6 +3934,7 @@ static gameinfo_t gamelist[] = {GAME_NORMAL, &sharewarequakegame, ®isteredquakegame}, {GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame}, {GAME_ROGUE, &roguegame, &roguegame}, + {GAME_QUOTH, &sharewarequakegame, ®isteredquakegame}, {GAME_NEHAHRA, &nehahragame, &nehahragame}, {GAME_TRANSFUSION, &transfusiongame, &transfusiongame}, {GAME_GOODVSBAD2, &goodvsbad2game, &goodvsbad2game}, @@ -3940,10 +3949,10 @@ static gamelevels_t *gameoptions_levels = NULL; static int startepisode; static int startlevel; static int maxplayers; -static qboolean m_serverInfoMessage = false; +static qbool m_serverInfoMessage = false; static double m_serverInfoMessageTime; -void M_Menu_GameOptions_f (void) +void M_Menu_GameOptions_f(cmd_state_t *cmd) { int i; key_dest = key_menu; @@ -3969,18 +3978,19 @@ void M_GameOptions_Draw (void) { cachepic_t *p; int x; + char vabuf[1024]; M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); p = Draw_CachePic ("gfx/p_multi"); - M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); + M_DrawPic ( (320-Draw_GetPicWidth(p))/2, 4, "gfx/p_multi"); M_DrawTextBox (152, 32, 10, 1); M_Print(160, 40, "begin game"); M_Print(0, 56, " Max players"); - M_Print(160, 56, va("%i", maxplayers) ); + M_Print(160, 56, va(vabuf, sizeof(vabuf), "%i", maxplayers) ); if (gamemode != GAME_GOODVSBAD2) { @@ -3988,7 +3998,7 @@ void M_GameOptions_Draw (void) if (gamemode == GAME_TRANSFUSION) { if (!coop.integer && !deathmatch.integer) - Cvar_SetValue("deathmatch", 1); + Cvar_SetValue(&cvars_all, "deathmatch", 1); if (deathmatch.integer == 0) M_Print(160, 64, "Cooperative"); else if (deathmatch.integer == 2) @@ -3999,7 +4009,7 @@ void M_GameOptions_Draw (void) else if (gamemode == GAME_BATTLEMECH) { if (!deathmatch.integer) - Cvar_SetValue("deathmatch", 1); + Cvar_SetValue(&cvars_all, "deathmatch", 1); if (deathmatch.integer == 2) M_Print(160, 64, "Rambo Match"); else @@ -4008,7 +4018,7 @@ void M_GameOptions_Draw (void) else { if (!coop.integer && !deathmatch.integer) - Cvar_SetValue("deathmatch", 1); + Cvar_SetValue(&cvars_all, "deathmatch", 1); if (coop.integer) M_Print(160, 64, "Cooperative"); else @@ -4073,20 +4083,20 @@ void M_GameOptions_Draw (void) if (fraglimit.integer == 0) M_Print(160, 88, "none"); else - M_Print(160, 88, va("%i frags", fraglimit.integer)); + M_Print(160, 88, va(vabuf, sizeof(vabuf), "%i frags", fraglimit.integer)); M_Print(0, 96, " Time Limit"); if (timelimit.integer == 0) M_Print(160, 96, "none"); else - M_Print(160, 96, va("%i minutes", timelimit.integer)); + M_Print(160, 96, va(vabuf, sizeof(vabuf), "%i minutes", timelimit.integer)); } M_Print(0, 104, " Public server"); M_Print(160, 104, (sv_public.integer == 0) ? "no" : "yes"); M_Print(0, 112, " Server maxrate"); - M_Print(160, 112, va("%i", sv_maxrate.integer)); + M_Print(160, 112, va(vabuf, sizeof(vabuf), "%i", sv_maxrate.integer)); M_Print(0, 128, " Server name"); M_DrawTextBox (0, 132, 38, 1); @@ -4104,13 +4114,13 @@ void M_GameOptions_Draw (void) // line cursor if (gameoptions_cursor == 9) - M_DrawCharacter (8 + 8 * strlen(hostname.string), gameoptions_cursor_table[gameoptions_cursor], 10+((int)(realtime*4)&1)); + M_DrawCharacter (8 + 8 * strlen(hostname.string), gameoptions_cursor_table[gameoptions_cursor], 10+((int)(host.realtime*4)&1)); else - M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1)); + M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(host.realtime*4)&1)); if (m_serverInfoMessage) { - if ((realtime - m_serverInfoMessageTime) < 5.0) + if ((host.realtime - m_serverInfoMessageTime) < 5.0) { x = (320-26*8)/2; M_DrawTextBox (x, 138, 24, 4); @@ -4118,7 +4128,7 @@ void M_GameOptions_Draw (void) 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, " lordhavoc@ghdigital.com"); + M_Print(x, 170, "darkplacesengine@gmail.com"); } else m_serverInfoMessage = false; @@ -4138,7 +4148,7 @@ static void M_NetStart_Change (int dir) { maxplayers = MAX_SCOREBOARD; m_serverInfoMessage = true; - m_serverInfoMessageTime = realtime; + m_serverInfoMessageTime = host.realtime; } if (maxplayers < 2) maxplayers = 2; @@ -4286,15 +4296,16 @@ static void M_NetStart_Change (int dir) } } -static void M_GameOptions_Key (int key, int ascii) +static void M_GameOptions_Key(cmd_state_t *cmd, int key, int ascii) { int l; char hostnamebuf[128]; + char vabuf[1024]; switch (key) { case K_ESCAPE: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case K_UPARROW: @@ -4330,10 +4341,10 @@ static void M_GameOptions_Key (int key, int ascii) if (gameoptions_cursor == 0) { if (sv.active) - Cbuf_AddText ("disconnect\n"); - Cbuf_AddText ( va ("maxplayers %u\n", maxplayers) ); + Cbuf_AddText(cmd, "disconnect\n"); + Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "maxplayers %u\n", maxplayers) ); - Cbuf_AddText ( va ("map %s\n", gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].name) ); + Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "map %s\n", gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].name) ); return; } @@ -4349,7 +4360,7 @@ static void M_GameOptions_Key (int key, int ascii) l = min(l - 1, 37); memcpy(hostnamebuf, hostname.string, l); hostnamebuf[l] = 0; - Cvar_Set("hostname", hostnamebuf); + Cvar_Set(&cvars_all, "hostname", hostnamebuf); } } break; @@ -4365,7 +4376,7 @@ static void M_GameOptions_Key (int key, int ascii) memcpy(hostnamebuf, hostname.string, l); hostnamebuf[l] = ascii; hostnamebuf[l+1] = 0; - Cvar_Set("hostname", hostnamebuf); + Cvar_Set(&cvars_all, "hostname", hostnamebuf); } } } @@ -4376,7 +4387,7 @@ static void M_GameOptions_Key (int key, int ascii) static int slist_cursor; -void M_Menu_ServerList_f (void) +void M_Menu_ServerList_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_slist; @@ -4384,17 +4395,18 @@ void M_Menu_ServerList_f (void) slist_cursor = 0; M_Update_Return_Reason(""); if (lanConfig_cursor == 2) - Net_SlistQW_f(); + Net_SlistQW_f(cmd); else - Net_Slist_f(); + Net_Slist_f(cmd); } static void M_ServerList_Draw (void) { - int n, y, visible, start, end, numplayers, maxplayers; + int n, y, visible, start, end, statnumplayers, statmaxplayers; cachepic_t *p; const char *s; + char vabuf[1024]; // use as much vertical space as available if (gamemode == GAME_TRANSFUSION) @@ -4402,8 +4414,8 @@ static void M_ServerList_Draw (void) else M_Background(640, vid_conheight.integer); // scroll the list as the cursor moves - ServerList_GetPlayerStatistics(&numplayers, &maxplayers); - s = va("%i/%i masters %i/%i servers %i/%i players", masterreplycount, masterquerycount, serverreplycount, serverquerycount, numplayers, maxplayers); + ServerList_GetPlayerStatistics(&statnumplayers, &statmaxplayers); + s = va(vabuf, sizeof(vabuf), "%i/%i masters %i/%i servers %i/%i players", masterreplycount, masterquerycount, serverreplycount, serverquerycount, statnumplayers, statmaxplayers); M_PrintRed((640 - strlen(s) * 8) / 2, 32, s); if (*m_return_reason) M_Print(16, menu_height - 8, m_return_reason); @@ -4413,18 +4425,18 @@ static void M_ServerList_Draw (void) end = min(start + visible, serverlist_viewcount); p = Draw_CachePic ("gfx/p_multi"); - M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi"); + M_DrawPic((640 - Draw_GetPicWidth(p)) / 2, 4, "gfx/p_multi"); if (end > start) { for (n = start;n < end;n++) { serverlist_entry_t *entry = ServerList_GetViewEntry(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); + DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(host.realtime * M_PI)) : 0, 0, 0, 0.5, 0); M_PrintColored(0, y, entry->line1);y += 8; M_PrintColored(0, y, entry->line2);y += 8; } } - else if (realtime - masterquerytime > 10) + else if (host.realtime - masterquerytime > 10) { if (masterquerycount) M_Print(0, y, "No servers found"); @@ -4441,19 +4453,20 @@ static void M_ServerList_Draw (void) } -static void M_ServerList_Key(int k, int ascii) +static void M_ServerList_Key(cmd_state_t *cmd, int k, int ascii) { + char vabuf[1024]; switch (k) { case K_ESCAPE: - M_Menu_LanConfig_f(); + M_Menu_LanConfig_f(cmd); break; case K_SPACE: if (lanConfig_cursor == 2) - Net_SlistQW_f(); + Net_SlistQW_f(cmd); else - Net_Slist_f(); + Net_Slist_f(cmd); break; case K_UPARROW: @@ -4475,7 +4488,7 @@ static void M_ServerList_Key(int k, int ascii) case K_ENTER: S_LocalSound ("sound/misc/menu2.wav"); if (serverlist_viewcount) - Cbuf_AddText(va("connect \"%s\"\n", ServerList_GetViewEntry(slist_cursor)->info.cname)); + Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "connect \"%s\"\n", ServerList_GetViewEntry(slist_cursor)->info.cname)); break; default: @@ -4493,7 +4506,7 @@ static int modlist_numenabled; //number of enabled (or in process to be..) mod typedef struct modlist_entry_s { - qboolean loaded; // used to determine whether this entry is loaded and running + qbool loaded; // used to determine whether this entry is loaded and running int enabled; // index to array of modlist_enabled // name of the modification, this is (will...be) displayed on the menu entry @@ -4508,25 +4521,31 @@ static int modlist_cursor; static int modlist_count = 0; static modlist_entry_t modlist[MODLIST_TOTALSIZE]; -void ModList_RebuildList(void) +static void ModList_RebuildList(void) { int i,j; stringlist_t list; + const char *description; stringlistinit(&list); listdirectory(&list, fs_basedir, ""); - stringlistsort(&list); + stringlistsort(&list, true); modlist_count = 0; modlist_numenabled = fs_numgamedirs; - for (i = 0;i < list.numstrings;i++) + for (i = 0;i < list.numstrings && modlist_count < MODLIST_TOTALSIZE;i++) { - if (modlist_count >= MODLIST_TOTALSIZE) break; - // check all dirs to see if they "appear" to be mods + // quickly skip names with dot characters - generally these are files, not directories + if (strchr(list.strings[i], '.')) continue; + // reject any dirs that are part of the base game if (gamedirname1 && !strcasecmp(gamedirname1, list.strings[i])) continue; //if (gamedirname2 && !strcasecmp(gamedirname2, list.strings[i])) continue; - if (FS_CheckNastyPath (list.strings[i], true)) continue; - if (!FS_CheckGameDir(list.strings[i])) continue; + + // check if we can get a description of the gamedir (from modinfo.txt), + // or if the directory is valid but has no description (fs_checkgamedir_missing) + // otherwise this isn't a valid gamedir + description = FS_CheckGameDir(list.strings[i]); + if (description == NULL || description == fs_checkgamedir_missing) continue; strlcpy (modlist[modlist_count].dir, list.strings[i], sizeof(modlist[modlist_count].dir)); //check currently loaded mods @@ -4545,7 +4564,7 @@ void ModList_RebuildList(void) stringlistfreecontents(&list); } -void ModList_Enable (void) +static void ModList_Enable (void) { int i; int numgamedirs; @@ -4577,7 +4596,7 @@ void ModList_Enable (void) FS_ChangeGameDirs (modlist_numenabled, gamedirs, true, true); } -void M_Menu_ModList_f (void) +void M_Menu_ModList_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_modlist; @@ -4642,12 +4661,12 @@ static void M_ModList_Draw (void) end = min(start + visible, modlist_count); p = Draw_CachePic ("gfx/p_option"); - M_DrawPic((640 - p->width) / 2, 4, "gfx/p_option"); + M_DrawPic((640 - Draw_GetPicWidth(p)) / 2, 4, "gfx/p_option"); if (end > start) { for (n = start;n < end;n++) { - DrawQ_Pic(menu_x + 40, menu_y + y, NULL, 360, 8, n == modlist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0); + DrawQ_Pic(menu_x + 40, menu_y + y, NULL, 360, 8, n == modlist_cursor ? (0.5 + 0.2 * sin(host.realtime * M_PI)) : 0, 0, 0, 0.5, 0); M_ItemPrint(80, y, modlist[n].dir, true); M_DrawCheckbox(48, y, modlist[n].loaded); y +=8; @@ -4659,13 +4678,13 @@ static void M_ModList_Draw (void) } } -static void M_ModList_Key(int k, int ascii) +static void M_ModList_Key(cmd_state_t *cmd, int k, int ascii) { switch (k) { case K_ESCAPE: ModList_Enable (); - M_Menu_Options_f(); + M_Menu_Options_f(cmd); break; case K_SPACE: @@ -4709,39 +4728,40 @@ static void M_ModList_Key(int k, int ascii) //============================================================================= /* Menu Subsystem */ -static void M_KeyEvent(int key, int ascii, qboolean downevent); +static void M_KeyEvent(int key, int ascii, qbool downevent); static void M_Draw(void); void M_ToggleMenu(int mode); static void M_Shutdown(void); -void M_Init (void) +static void M_Init (void) { menuplyr_load = true; menuplyr_pixels = NULL; - 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 ("menu_mods", M_Menu_ModList_f, "open the mods browser 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"); + Cmd_AddCommand(CF_CLIENT, "menu_main", M_Menu_Main_f, "open the main menu"); + Cmd_AddCommand(CF_CLIENT, "menu_singleplayer", M_Menu_SinglePlayer_f, "open the singleplayer menu"); + Cmd_AddCommand(CF_CLIENT, "menu_load", M_Menu_Load_f, "open the loadgame menu"); + Cmd_AddCommand(CF_CLIENT, "menu_save", M_Menu_Save_f, "open the savegame menu"); + Cmd_AddCommand(CF_CLIENT, "menu_multiplayer", M_Menu_MultiPlayer_f, "open the multiplayer menu"); + Cmd_AddCommand(CF_CLIENT, "menu_setup", M_Menu_Setup_f, "open the player setup menu"); + Cmd_AddCommand(CF_CLIENT, "menu_options", M_Menu_Options_f, "open the options menu"); + Cmd_AddCommand(CF_CLIENT, "menu_options_effects", M_Menu_Options_Effects_f, "open the effects options menu"); + Cmd_AddCommand(CF_CLIENT, "menu_options_graphics", M_Menu_Options_Graphics_f, "open the graphics options menu"); + Cmd_AddCommand(CF_CLIENT, "menu_options_colorcontrol", M_Menu_Options_ColorControl_f, "open the color control menu"); + Cmd_AddCommand(CF_CLIENT, "menu_keys", M_Menu_Keys_f, "open the key binding menu"); + Cmd_AddCommand(CF_CLIENT, "menu_video", M_Menu_Video_f, "open the video options menu"); + Cmd_AddCommand(CF_CLIENT, "menu_reset", M_Menu_Reset_f, "open the reset to defaults menu"); + Cmd_AddCommand(CF_CLIENT, "menu_mods", M_Menu_ModList_f, "open the mods browser menu"); + Cmd_AddCommand(CF_CLIENT, "help", M_Menu_Help_f, "open the help menu"); + Cmd_AddCommand(CF_CLIENT, "menu_quit", M_Menu_Quit_f, "open the quit menu"); + Cmd_AddCommand(CF_CLIENT, "menu_transfusion_episode", M_Menu_Transfusion_Episode_f, "open the transfusion episode select menu"); + Cmd_AddCommand(CF_CLIENT, "menu_transfusion_skill", M_Menu_Transfusion_Skill_f, "open the transfusion skill select menu"); + Cmd_AddCommand(CF_CLIENT, "menu_credits", M_Menu_Credits_f, "open the credits menu"); } void M_Draw (void) { + char vabuf[1024]; if (key_dest != key_menu && key_dest != key_menu_grabbed) m_state = m_none; @@ -4852,14 +4872,14 @@ void M_Draw (void) int g, scale_x, scale_y, scale_y_repeat, top_offset; float scale_y_rate; scale_y_repeat = vid_conheight.integer * 2; - g = (int)(realtime * 64)%96; + g = (int)(host.realtime * 64)%96; scale_y_rate = (float)(g+1) / 96; top_offset = (g+12)/12; - p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset)); + p = Draw_CachePic (va(vabuf, sizeof(vabuf), "gfx/menu/blooddrip%i", top_offset)); drop1 = Draw_CachePic ("gfx/menu/blooddrop1"); drop2 = Draw_CachePic ("gfx/menu/blooddrop2"); drop3 = Draw_CachePic ("gfx/menu/blooddrop3"); - for (scale_x = 0; scale_x <= vid_conwidth.integer; scale_x += p->width) { + for (scale_x = 0; scale_x <= vid_conwidth.integer; scale_x += Draw_GetPicWidth(p)) { 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); @@ -4873,7 +4893,7 @@ void M_Draw (void) 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, Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset)), 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x, -1, Draw_CachePic (va(vabuf, sizeof(vabuf), "gfx/menu/blooddrip%i", top_offset)), 0, 0, 1, 1, 1, 1, 0); } } } @@ -4888,8 +4908,9 @@ void M_Draw (void) } -void M_KeyEvent (int key, int ascii, qboolean downevent) +void M_KeyEvent (int key, int ascii, qbool downevent) { + cmd_state_t *cmd = cmd_local; if (!downevent) return; switch (m_state) @@ -4898,102 +4919,107 @@ void M_KeyEvent (int key, int ascii, qboolean downevent) return; case m_main: - M_Main_Key (key, ascii); + M_Main_Key(cmd, key, ascii); return; case m_demo: - M_Demo_Key (key, ascii); + M_Demo_Key(cmd, key, ascii); return; case m_singleplayer: - M_SinglePlayer_Key (key, ascii); + M_SinglePlayer_Key(cmd, key, ascii); return; case m_transfusion_episode: - M_Transfusion_Episode_Key (key, ascii); + M_Transfusion_Episode_Key(cmd, key, ascii); return; case m_transfusion_skill: - M_Transfusion_Skill_Key (key, ascii); + M_Transfusion_Skill_Key(cmd, key, ascii); return; case m_load: - M_Load_Key (key, ascii); + M_Load_Key(cmd, key, ascii); return; case m_save: - M_Save_Key (key, ascii); + M_Save_Key(cmd, key, ascii); return; case m_multiplayer: - M_MultiPlayer_Key (key, ascii); + M_MultiPlayer_Key(cmd, key, ascii); return; case m_setup: - M_Setup_Key (key, ascii); + M_Setup_Key(cmd, key, ascii); return; case m_options: - M_Options_Key (key, ascii); + M_Options_Key(cmd, key, ascii); return; case m_options_effects: - M_Options_Effects_Key (key, ascii); + M_Options_Effects_Key(cmd, key, ascii); return; case m_options_graphics: - M_Options_Graphics_Key (key, ascii); + M_Options_Graphics_Key(cmd, key, ascii); return; case m_options_colorcontrol: - M_Options_ColorControl_Key (key, ascii); + M_Options_ColorControl_Key(cmd, key, ascii); return; case m_keys: - M_Keys_Key (key, ascii); + M_Keys_Key(cmd, key, ascii); return; case m_reset: - M_Reset_Key (key, ascii); + M_Reset_Key(cmd, key, ascii); return; case m_video: - M_Video_Key (key, ascii); + M_Video_Key(cmd, key, ascii); return; case m_help: - M_Help_Key (key, ascii); + M_Help_Key(cmd, key, ascii); return; case m_credits: - M_Credits_Key (key, ascii); + M_Credits_Key(cmd, key, ascii); return; case m_quit: - M_Quit_Key (key, ascii); + M_Quit_Key(cmd, key, ascii); return; case m_lanconfig: - M_LanConfig_Key (key, ascii); + M_LanConfig_Key(cmd, key, ascii); return; case m_gameoptions: - M_GameOptions_Key (key, ascii); + M_GameOptions_Key(cmd, key, ascii); return; case m_slist: - M_ServerList_Key (key, ascii); + M_ServerList_Key(cmd, key, ascii); return; case m_modlist: - M_ModList_Key (key, ascii); + M_ModList_Key(cmd, key, ascii); return; } } -void M_NewMap(void) +static void M_NewMap(void) +{ +} + +static int M_GetServerListEntryCategory(const serverlist_entry_t *entry) { + return 0; } void M_Shutdown(void) @@ -5173,26 +5199,31 @@ static prvm_required_field_t m_required_globals[] = static int m_numrequiredglobals = sizeof(m_required_globals) / sizeof(m_required_globals[0]); -void MR_SetRouting (qboolean forceold); +void MR_SetRouting (qbool forceold); -void MP_Error(const char *format, ...) DP_FUNC_PRINTF(1); -void MP_Error(const char *format, ...) +void MVM_error_cmd(const char *format, ...) DP_FUNC_PRINTF(1); +void MVM_error_cmd(const char *format, ...) { - static qboolean processingError = false; + prvm_prog_t *prog = MVM_prog; + static qbool processingError = false; char errorstring[MAX_INPUTLINE]; va_list argptr; va_start (argptr, format); dpvsnprintf (errorstring, sizeof(errorstring), format, argptr); va_end (argptr); + + if (host.framecount < 3) + Sys_Error("Menu_Error: %s\n", errorstring); + Con_Printf( "Menu_Error: %s\n", errorstring ); if( !processingError ) { processingError = true; - PRVM_Crash(); + PRVM_Crash(prog); processingError = false; } else { - Con_Printf( "Menu_Error: Recursive call to MP_Error (from PRVM_Crash)!\n" ); + Con_Printf( "Menu_Error: Recursive call to MVM_error_cmd (from PRVM_Crash)!\n" ); } // fall back to the normal menu @@ -5203,32 +5234,71 @@ void MP_Error(const char *format, ...) key_dest = key_game; // init the normal menu now -> this will also correct the menu router pointers - MR_SetRouting (TRUE); + MR_SetRouting (true); // reset the active scene, too (to be on the safe side ;)) - R_SelectScene( RST_CLIENT ); + R_SelectScene( RST_CLIENT ); + // Let video start at least Host_AbortCurrentFrame(); } -void MP_KeyEvent (int key, int ascii, qboolean downevent) +static void MVM_begin_increase_edicts(prvm_prog_t *prog) +{ +} + +static void MVM_end_increase_edicts(prvm_prog_t *prog) +{ +} + +static void MVM_init_edict(prvm_prog_t *prog, prvm_edict_t *edict) +{ +} + +static void MVM_free_edict(prvm_prog_t *prog, prvm_edict_t *ed) +{ +} + +static void MVM_count_edicts(prvm_prog_t *prog) { - PRVM_Begin; - PRVM_SetProg(PRVM_MENUPROG); + int i; + prvm_edict_t *ent; + int active; + + active = 0; + for (i=0 ; inum_edicts ; i++) + { + ent = PRVM_EDICT_NUM(i); + if (ent->free) + continue; + active++; + } + + Con_Printf("num_edicts:%3i\n", prog->num_edicts); + Con_Printf("active :%3i\n", active); +} + +static qbool MVM_load_edict(prvm_prog_t *prog, prvm_edict_t *ent) +{ + return true; +} + +static void MP_KeyEvent (int key, int ascii, qbool downevent) +{ + prvm_prog_t *prog = MVM_prog; // pass key - prog->globals.generic[OFS_PARM0] = (float) key; - prog->globals.generic[OFS_PARM1] = (float) ascii; + prog->globals.fp[OFS_PARM0] = (prvm_vec_t) key; + prog->globals.fp[OFS_PARM1] = (prvm_vec_t) ascii; if (downevent) - PRVM_ExecuteProgram(PRVM_menufunction(m_keydown),"m_keydown(float key, float ascii) required"); + prog->ExecuteProgram(prog, PRVM_menufunction(m_keydown),"m_keydown(float key, float ascii) required"); else if (PRVM_menufunction(m_keyup)) - PRVM_ExecuteProgram(PRVM_menufunction(m_keyup),"m_keyup(float key, float ascii) required"); - - PRVM_End; + prog->ExecuteProgram(prog, PRVM_menufunction(m_keyup),"m_keyup(float key, float ascii) required"); } -void MP_Draw (void) +static void MP_Draw (void) { + prvm_prog_t *prog = MVM_prog; // declarations that are needed right now float oldquality; @@ -5242,16 +5312,16 @@ void MP_Draw (void) oldquality = r_refdef.view.quality; r_refdef.view.quality = 1; // TODO: this needs to be exposed to R_SetView (or something similar) ASAP [2/5/2008 Andreas] - r_refdef.scene.time = realtime; + r_refdef.scene.time = host.realtime; - PRVM_Begin; - PRVM_SetProg(PRVM_MENUPROG); + // free memory for resources that are no longer referenced + PRVM_GarbageCollection(prog); // FIXME: this really shouldnt error out lest we have a very broken refdef state...? // or does it kill the server too? - PRVM_ExecuteProgram(PRVM_menufunction(m_draw),"m_draw() required"); - - PRVM_End; + PRVM_G_FLOAT(OFS_PARM0) = vid.width; + PRVM_G_FLOAT(OFS_PARM1) = vid.height; + prog->ExecuteProgram(prog, PRVM_menufunction(m_draw),"m_draw() required"); // TODO: imo this should be moved into scene, too [1/27/2008 Andreas] r_refdef.view.quality = oldquality; @@ -5259,63 +5329,81 @@ void MP_Draw (void) R_SelectScene( RST_CLIENT ); } -void MP_ToggleMenu(int mode) +static void MP_ToggleMenu(int mode) { - PRVM_Begin; - PRVM_SetProg(PRVM_MENUPROG); - - prog->globals.generic[OFS_PARM0] = (float) mode; - PRVM_ExecuteProgram(PRVM_menufunction(m_toggle),"m_toggle() required"); + prvm_prog_t *prog = MVM_prog; - PRVM_End; + prog->globals.fp[OFS_PARM0] = (prvm_vec_t) mode; + prog->ExecuteProgram(prog, PRVM_menufunction(m_toggle),"m_toggle(float mode) required"); } -void MP_NewMap(void) +static void MP_NewMap(void) { - PRVM_Begin; - PRVM_SetProg(PRVM_MENUPROG); + prvm_prog_t *prog = MVM_prog; if (PRVM_menufunction(m_newmap)) - PRVM_ExecuteProgram(PRVM_menufunction(m_newmap),"m_newmap() required"); - PRVM_End; + prog->ExecuteProgram(prog, PRVM_menufunction(m_newmap),"m_newmap() required"); } -void MP_Shutdown (void) +const serverlist_entry_t *serverlist_callbackentry = NULL; +static int MP_GetServerListEntryCategory(const serverlist_entry_t *entry) { - PRVM_Begin; - PRVM_SetProg(PRVM_MENUPROG); + prvm_prog_t *prog = MVM_prog; + serverlist_callbackentry = entry; + if (PRVM_menufunction(m_gethostcachecategory)) + { + prog->globals.fp[OFS_PARM0] = (prvm_vec_t) -1; + prog->ExecuteProgram(prog, PRVM_menufunction(m_gethostcachecategory),"m_gethostcachecategory(float entry) required"); + serverlist_callbackentry = NULL; + return prog->globals.fp[OFS_RETURN]; + } + else + { + return 0; + } +} - PRVM_ExecuteProgram(PRVM_menufunction(m_shutdown),"m_shutdown() required"); +static void MP_Shutdown (void) +{ + prvm_prog_t *prog = MVM_prog; + if (prog->loaded) + prog->ExecuteProgram(prog, PRVM_menufunction(m_shutdown),"m_shutdown() required"); // reset key_dest key_dest = key_game; // AK not using this cause Im not sure whether this is useful at all instead : - PRVM_ResetProg(); - - PRVM_End; + PRVM_Prog_Reset(prog); } -void MP_Init (void) +static void MP_Init (void) { - PRVM_Begin; - PRVM_InitProg(PRVM_MENUPROG); + prvm_prog_t *prog = MVM_prog; + PRVM_Prog_Init(prog, cmd_local); prog->edictprivate_size = 0; // no private struct used - prog->name = M_NAME; + prog->name = "menu"; prog->num_edicts = 1; prog->limit_edicts = M_MAX_EDICTS; prog->extensionstring = vm_m_extensions; prog->builtins = vm_m_builtins; prog->numbuiltins = vm_m_numbuiltins; - prog->init_cmd = VM_M_Cmd_Init; - prog->reset_cmd = VM_M_Cmd_Reset; - prog->error_cmd = MP_Error; - prog->ExecuteProgram = MVM_ExecuteProgram; + + // all callbacks must be defined (pointers are not checked before calling) + prog->begin_increase_edicts = MVM_begin_increase_edicts; + prog->end_increase_edicts = MVM_end_increase_edicts; + prog->init_edict = MVM_init_edict; + prog->free_edict = MVM_free_edict; + prog->count_edicts = MVM_count_edicts; + prog->load_edict = MVM_load_edict; + prog->init_cmd = MVM_init_cmd; + prog->reset_cmd = MVM_reset_cmd; + prog->error_cmd = MVM_error_cmd; + prog->ExecuteProgram = MVM_ExecuteProgram; // allocate the mempools - prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL); + prog->progs_mempool = Mem_AllocPool(menu_progs.string, 0, NULL); - PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, m_numrequiredfields, m_required_fields, m_numrequiredglobals, m_required_globals); + PRVM_Prog_Load(prog, menu_progs.string, NULL, 0, m_numrequiredfunc, m_required_func, m_numrequiredfields, m_required_fields, m_numrequiredglobals, m_required_globals); // note: OP_STATE is not supported by menu qc, we don't even try to detect // it here @@ -5323,24 +5411,26 @@ void MP_Init (void) in_client_mouse = true; // call the prog init - PRVM_ExecuteProgram(PRVM_menufunction(m_init),"m_init() required"); + prog->ExecuteProgram(prog, PRVM_menufunction(m_init),"m_init() required"); - PRVM_End; + // Once m_init was called, we consider menuqc code fully initialized. + prog->inittime = host.realtime; } //============================================================================ // Menu router -void (*MR_KeyEvent) (int key, int ascii, qboolean downevent); +void (*MR_KeyEvent) (int key, int ascii, qbool downevent); void (*MR_Draw) (void); void (*MR_ToggleMenu) (int mode); void (*MR_Shutdown) (void); void (*MR_NewMap) (void); +int (*MR_GetServerListEntryCategory) (const serverlist_entry_t *entry); -void MR_SetRouting(qboolean forceold) +void MR_SetRouting(qbool forceold) { // if the menu prog isnt available or forceqmenu ist set, use the old menu - if(!FS_FileExists(M_PROG_FILENAME) || forceqmenu.integer || forceold) + if(!FS_FileExists(menu_progs.string) || forceqmenu.integer || forceold) { // set menu router function pointers MR_KeyEvent = M_KeyEvent; @@ -5348,6 +5438,7 @@ void MR_SetRouting(qboolean forceold) MR_ToggleMenu = M_ToggleMenu; MR_Shutdown = M_Shutdown; MR_NewMap = M_NewMap; + MR_GetServerListEntryCategory = M_GetServerListEntryCategory; M_Init(); } else @@ -5358,6 +5449,7 @@ void MR_SetRouting(qboolean forceold) MR_ToggleMenu = MP_ToggleMenu; MR_Shutdown = MP_Shutdown; MR_NewMap = MP_NewMap; + MR_GetServerListEntryCategory = MP_GetServerListEntryCategory; MP_Init(); } } @@ -5366,14 +5458,19 @@ void MR_Restart(void) { if(MR_Shutdown) MR_Shutdown (); - MR_SetRouting (FALSE); + MR_SetRouting (false); +} + +static void MR_Restart_f(cmd_state_t *cmd) +{ + MR_Restart(); } -void Call_MR_ToggleMenu_f(void) +static void Call_MR_ToggleMenu_f(cmd_state_t *cmd) { int m; - m = ((Cmd_Argc() < 2) ? -1 : atoi(Cmd_Argv(1))); - Host_StartVideo(); + m = ((Cmd_Argc(cmd) < 2) ? -1 : atoi(Cmd_Argv(cmd, 1))); + CL_StartVideo(); if(MR_ToggleMenu) MR_ToggleMenu(m); } @@ -5383,8 +5480,9 @@ void MR_Init_Commands(void) // set router console commands Cvar_RegisterVariable (&forceqmenu); Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue); - Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat)"); - Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu"); + Cvar_RegisterVariable (&menu_progs); + Cmd_AddCommand(CF_CLIENT, "menu_restart", MR_Restart_f, "restart menu system (reloads menu.dat)"); + Cmd_AddCommand(CF_CLIENT, "togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu"); } void MR_Init(void) @@ -5396,7 +5494,7 @@ void MR_Init(void) res_count = VID_SortModes(res, res_count, false, false, true); if(res_count) { - video_resolutions_count = res_count; + video_resolutions_count = (int)res_count; video_resolutions = (video_resolution_t *) Mem_Alloc(cls.permanentmempool, sizeof(*video_resolutions) * (video_resolutions_count + 1)); memset(&video_resolutions[video_resolutions_count], 0, sizeof(video_resolutions[video_resolutions_count])); for(i = 0; i < res_count; ++i) @@ -5514,13 +5612,13 @@ void MR_Init(void) // use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1) // COMMANDLINEOPTION: Client: -forceqmenu disables menu.dat (same as +forceqmenu 1) - if(COM_CheckParm("-forceqmenu")) + if(Sys_CheckParm("-forceqmenu")) Cvar_SetValueQuick(&forceqmenu,1); // use -useqmenu for debugging proposes, cause it starts // the normal quake menu only the first time // COMMANDLINEOPTION: Client: -useqmenu causes the first time you open the menu to use the quake menu, then reverts to menu.dat (if forceqmenu is 0) - if(COM_CheckParm("-useqmenu")) - MR_SetRouting (TRUE); + if(Sys_CheckParm("-useqmenu")) + MR_SetRouting (true); else - MR_SetRouting (FALSE); + MR_SetRouting (false); }