X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=menu.c;h=6092254778caf4b391aae2a353af076c5a7820c6;hp=d09872ddc493ae4f87811d230c6f71b87b3ee555;hb=c86f199b83d6e60a28de0ad2509319db7408ba60;hpb=6fb644eee19956bee121e1f2430d2b84067dc056 diff --git a/menu.c b/menu.c index d09872dd..60922547 100644 --- a/menu.c +++ b/menu.c @@ -18,9 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" -#ifdef CONFIG_CD #include "cdaudio.h" -#endif #include "image.h" #include "progsvm.h" @@ -30,36 +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 menu_progs = { 0, "menu_progs", "menu.dat", "name of quakec menu.dat file" }; +static cvar_t forceqmenu = {CVAR_CLIENT, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)"}; +static cvar_t menu_progs = {CVAR_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); @@ -85,28 +83,28 @@ 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 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 qboolean m_entersound; ///< play after drawing a frame, so caching won't disrupt the sound @@ -284,7 +282,7 @@ static 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_client); } else { @@ -311,7 +309,7 @@ static void M_Demo_Draw (void) } -static void M_Menu_Demos_f (void) +static void M_Menu_Demos_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_demo; @@ -319,20 +317,20 @@ static 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(vabuf, sizeof(vabuf), "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: @@ -362,7 +360,7 @@ static qboolean 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"; @@ -414,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; @@ -458,7 +456,7 @@ 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++) @@ -479,7 +477,7 @@ static void M_Main_Draw (void) 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) { @@ -499,7 +497,7 @@ static void M_Main_Draw (void) } -static void M_Main_Key (int key, int ascii) +static void M_Main_Key(cmd_state_t *cmd, int key, int ascii) { switch (key) { @@ -536,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; } } @@ -551,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; @@ -582,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; @@ -609,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; @@ -636,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; } } @@ -669,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; } } @@ -707,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; } } @@ -737,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; @@ -758,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) @@ -771,7 +769,7 @@ 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; @@ -781,7 +779,7 @@ static void M_SinglePlayer_Draw (void) } -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) { @@ -793,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: @@ -816,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; } } @@ -887,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; @@ -896,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 @@ -925,7 +923,7 @@ 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]); @@ -943,7 +941,7 @@ 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(vabuf, sizeof(vabuf), "gfx/menu/episode%i", y+1)); } @@ -1060,12 +1058,12 @@ static void M_Transfusion_Episode_Draw (void) 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: @@ -1083,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); } } @@ -1095,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; @@ -1110,7 +1108,7 @@ static void M_Transfusion_Skill_Draw (void) 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++) { @@ -1119,12 +1117,12 @@ static void M_Transfusion_Skill_Draw (void) 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: @@ -1146,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; } } @@ -1197,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; @@ -1215,7 +1213,7 @@ static void M_MultiPlayer_Draw (void) { 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(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)); @@ -1225,7 +1223,7 @@ static void M_MultiPlayer_Draw (void) 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; @@ -1234,12 +1232,12 @@ static void M_MultiPlayer_Draw (void) } -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: @@ -1260,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; } } @@ -1286,7 +1284,7 @@ static int setup_oldrate; #define NUM_SETUP_CMDS 5 -void M_Menu_Setup_f (void) +void M_Menu_Setup_f(cmd_state_t *cmd) { key_dest = key_menu; m_state = m_setup; @@ -1344,7 +1342,7 @@ static void M_Setup_Draw (void) 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); @@ -1362,7 +1360,7 @@ static void M_Setup_Draw (void) 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; @@ -1415,7 +1413,7 @@ 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"); @@ -1428,7 +1426,7 @@ static void M_Setup_Draw (void) } -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]; @@ -1436,7 +1434,7 @@ static void M_Setup_Key (int k, int ascii) switch (k) { case K_ESCAPE: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case K_UPARROW: @@ -1496,14 +1494,14 @@ forward: // setup_cursor == 4 (Accept changes) if (strcmp(cl_name.string, setup_myname) != 0) - Cbuf_AddText(va(vabuf, sizeof(vabuf), "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(vabuf, sizeof(vabuf), "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(vabuf, sizeof(vabuf), "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: @@ -1576,7 +1574,7 @@ 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; @@ -1624,9 +1622,7 @@ static void M_Menu_Options_AdjustSliders (int dir) else if (options_cursor == optnum++) Cvar_SetValueQuick(&v_contrast, bound(1, v_contrast.value + dir * 0.0625, 4)); else if (options_cursor == optnum++) Cvar_SetValueQuick(&v_gamma, bound(0.5, v_gamma.value + dir * 0.0625, 3)); else if (options_cursor == optnum++) Cvar_SetValueQuick(&volume, bound(0, volume.value + dir * 0.0625, 1)); -#ifdef CONFIG_CD else if (options_cursor == optnum++) Cvar_SetValueQuick(&bgmvolume, bound(0, bgmvolume.value + dir * 0.0625, 1)); -#endif } static int m_optnum; @@ -1680,7 +1676,7 @@ 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"); m_optnum = 0; m_optcursor = options_cursor; @@ -1703,9 +1699,7 @@ static void M_Options_Draw (void) M_Options_PrintSlider( " Brightness", true, v_contrast.value, 1, 2); M_Options_PrintSlider( " Gamma", true, v_gamma.value, 0.5, 3); M_Options_PrintSlider( " Sound Volume", snd_initialized.integer, volume.value, 0, 1); -#ifdef CONFIG_CD M_Options_PrintSlider( " Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1); -#endif M_Options_PrintCommand( " Customize Effects", true); M_Options_PrintCommand( " Effects: Quake", true); M_Options_PrintCommand( " Effects: Normal", true); @@ -1719,12 +1713,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: @@ -1732,51 +1726,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"); + 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"); + 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"); + 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"); + 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); @@ -1812,7 +1806,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; @@ -1889,7 +1883,7 @@ 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"); m_optcursor = options_effects_cursor; m_optnum = 0; @@ -1934,12 +1928,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: @@ -1975,7 +1969,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; @@ -1999,7 +1993,7 @@ extern cvar_t r_hdr_scenebrightness; extern cvar_t r_hdr_glowintensity; 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"); @@ -2023,7 +2017,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"); } @@ -2036,7 +2030,7 @@ 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"); m_optcursor = options_graphics_cursor; m_optnum = 0; @@ -2064,16 +2058,16 @@ static void M_Options_Graphics_Draw (void) } -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: @@ -2091,11 +2085,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; } } @@ -2106,9 +2100,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 = {CVAR_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; @@ -2124,8 +2118,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)); @@ -2218,7 +2210,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); @@ -2227,7 +2220,7 @@ 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"); m_optcursor = options_colorcontrol_cursor; m_optnum = 0; @@ -2235,8 +2228,7 @@ static void M_Options_ColorControl_Draw (void) 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); @@ -2244,10 +2236,10 @@ 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); @@ -2266,37 +2258,40 @@ static void M_Options_ColorControl_Draw (void) 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 = menu_options_colorcontrol_correctionvalue.value; // intensity value that should be matched up to a 50% dither to 'correct' quake + 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; m_opty += 8; x = 4; - DrawQ_Fill(menu_x + x, menu_y + m_opty, 64, 48, c, 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 + m_opty, 64, 48, 0, c, 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 + m_opty, 64, 48, 0, 0, c, 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 + m_opty, 64, 48, c, c, c, 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: @@ -2304,7 +2299,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); @@ -2554,7 +2548,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; @@ -2617,7 +2611,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"); @@ -2641,7 +2635,7 @@ 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 @@ -2668,9 +2662,9 @@ static void M_Keys_Draw (void) } -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]; @@ -2683,8 +2677,8 @@ static void M_Keys_Key (int k, int ascii) } else //if (k != '`') { - dpsnprintf (cmd, sizeof(cmd), "bind \"%s\" \"%s\"\n", Key_KeynumToString (k, tinystr, sizeof(tinystr)), 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; @@ -2694,7 +2688,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: @@ -2737,7 +2731,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; @@ -2745,13 +2739,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: @@ -2901,7 +2895,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; @@ -2928,7 +2922,7 @@ 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; @@ -2943,12 +2937,7 @@ static void M_Video_Draw (void) 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++; @@ -2981,7 +2970,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++; @@ -3016,8 +3005,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++) @@ -3037,7 +3024,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) { @@ -3051,7 +3038,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: @@ -3064,8 +3051,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); @@ -3103,7 +3090,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; @@ -3121,12 +3108,12 @@ static void M_Help_Draw (void) } -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: @@ -3149,7 +3136,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; @@ -3168,9 +3155,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); } //============================================================================= @@ -3259,7 +3246,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) @@ -3276,7 +3263,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) { @@ -3297,7 +3284,7 @@ static void M_Quit_Key (int key, int ascii) case 'Y': case 'y': - Host_Quit_f (); + Host_Quit_f(cmd); break; default: @@ -3339,7 +3326,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; @@ -3370,7 +3357,7 @@ static void M_LanConfig_Draw (void) 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) @@ -3412,7 +3399,7 @@ static void M_LanConfig_Draw (void) } -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]; @@ -3420,7 +3407,7 @@ static void M_LanConfig_Key (int key, int ascii) switch (key) { case K_ESCAPE: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case K_UPARROW: @@ -3449,23 +3436,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(vabuf, sizeof(vabuf), "connect \"%s\"\n", lanConfig_joinname) ); + Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "connect \"%s\"\n", lanConfig_joinname) ); break; case K_BACKSPACE: @@ -3962,7 +3949,7 @@ static int maxplayers; static qboolean 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; @@ -3994,7 +3981,7 @@ void M_GameOptions_Draw (void) 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"); @@ -4008,7 +3995,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) @@ -4019,7 +4006,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 @@ -4028,7 +4015,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 @@ -4306,7 +4293,7 @@ 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]; @@ -4315,7 +4302,7 @@ static void M_GameOptions_Key (int key, int ascii) switch (key) { case K_ESCAPE: - M_Menu_MultiPlayer_f (); + M_Menu_MultiPlayer_f(cmd); break; case K_UPARROW: @@ -4351,10 +4338,10 @@ static void M_GameOptions_Key (int key, int ascii) if (gameoptions_cursor == 0) { if (sv.active) - Cbuf_AddText("disconnect\n"); - Cbuf_AddText(va(vabuf, sizeof(vabuf), "maxplayers %u\n", maxplayers) ); + Cbuf_AddText(cmd, "disconnect\n"); + Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "maxplayers %u\n", maxplayers) ); - Cbuf_AddText(va(vabuf, sizeof(vabuf), "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; } @@ -4370,7 +4357,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; @@ -4386,7 +4373,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); } } } @@ -4397,7 +4384,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; @@ -4405,9 +4392,9 @@ 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); } @@ -4435,7 +4422,7 @@ 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++) @@ -4463,20 +4450,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: @@ -4498,7 +4485,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(vabuf, sizeof(vabuf), "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: @@ -4606,7 +4593,7 @@ static 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; @@ -4671,7 +4658,7 @@ 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++) @@ -4688,13 +4675,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: @@ -4748,25 +4735,25 @@ 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(&cmd_client, "menu_main", M_Menu_Main_f, "open the main menu"); + Cmd_AddCommand(&cmd_client, "menu_singleplayer", M_Menu_SinglePlayer_f, "open the singleplayer menu"); + Cmd_AddCommand(&cmd_client, "menu_load", M_Menu_Load_f, "open the loadgame menu"); + Cmd_AddCommand(&cmd_client, "menu_save", M_Menu_Save_f, "open the savegame menu"); + Cmd_AddCommand(&cmd_client, "menu_multiplayer", M_Menu_MultiPlayer_f, "open the multiplayer menu"); + Cmd_AddCommand(&cmd_client, "menu_setup", M_Menu_Setup_f, "open the player setup menu"); + Cmd_AddCommand(&cmd_client, "menu_options", M_Menu_Options_f, "open the options menu"); + Cmd_AddCommand(&cmd_client, "menu_options_effects", M_Menu_Options_Effects_f, "open the effects options menu"); + Cmd_AddCommand(&cmd_client, "menu_options_graphics", M_Menu_Options_Graphics_f, "open the graphics options menu"); + Cmd_AddCommand(&cmd_client, "menu_options_colorcontrol", M_Menu_Options_ColorControl_f, "open the color control menu"); + Cmd_AddCommand(&cmd_client, "menu_keys", M_Menu_Keys_f, "open the key binding menu"); + Cmd_AddCommand(&cmd_client, "menu_video", M_Menu_Video_f, "open the video options menu"); + Cmd_AddCommand(&cmd_client, "menu_reset", M_Menu_Reset_f, "open the reset to defaults menu"); + Cmd_AddCommand(&cmd_client, "menu_mods", M_Menu_ModList_f, "open the mods browser menu"); + Cmd_AddCommand(&cmd_client, "help", M_Menu_Help_f, "open the help menu"); + Cmd_AddCommand(&cmd_client, "menu_quit", M_Menu_Quit_f, "open the quit menu"); + Cmd_AddCommand(&cmd_client, "menu_transfusion_episode", M_Menu_Transfusion_Episode_f, "open the transfusion episode select menu"); + Cmd_AddCommand(&cmd_client, "menu_transfusion_skill", M_Menu_Transfusion_Skill_f, "open the transfusion skill select menu"); + Cmd_AddCommand(&cmd_client, "menu_credits", M_Menu_Credits_f, "open the credits menu"); } void M_Draw (void) @@ -4889,7 +4876,7 @@ void M_Draw (void) 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); @@ -4920,6 +4907,7 @@ void M_Draw (void) void M_KeyEvent (int key, int ascii, qboolean downevent) { + cmd_state_t *cmd = &cmd_client; if (!downevent) return; switch (m_state) @@ -4928,95 +4916,95 @@ 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; } @@ -5318,6 +5306,9 @@ static void MP_Draw (void) // TODO: this needs to be exposed to R_SetView (or something similar) ASAP [2/5/2008 Andreas] r_refdef.scene.time = realtime; + // 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_G_FLOAT(OFS_PARM0) = vid.width; @@ -5379,7 +5370,7 @@ static void MP_Shutdown (void) static void MP_Init (void) { prvm_prog_t *prog = MVM_prog; - PRVM_Prog_Init(prog); + PRVM_Prog_Init(prog, &cmd_client); prog->edictprivate_size = 0; // no private struct used prog->name = "menu"; @@ -5462,10 +5453,15 @@ void MR_Restart(void) MR_SetRouting (FALSE); } -static void Call_MR_ToggleMenu_f(void) +static void MR_Restart_f(cmd_state_t *cmd) +{ + MR_Restart(); +} + +static void Call_MR_ToggleMenu_f(cmd_state_t *cmd) { int m; - m = ((Cmd_Argc() < 2) ? -1 : atoi(Cmd_Argv(1))); + m = ((Cmd_Argc(cmd) < 2) ? -1 : atoi(Cmd_Argv(cmd, 1))); Host_StartVideo(); if(MR_ToggleMenu) MR_ToggleMenu(m); @@ -5477,8 +5473,8 @@ void MR_Init_Commands(void) Cvar_RegisterVariable (&forceqmenu); Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue); Cvar_RegisterVariable (&menu_progs); - Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat)"); - Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu"); + Cmd_AddCommand(&cmd_client, "menu_restart", MR_Restart_f, "restart menu system (reloads menu.dat)"); + Cmd_AddCommand(&cmd_client, "togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu"); } void MR_Init(void)