#define TYPE_GAME 2
#define TYPE_BOTH 3
-int NehGameType;
+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"};
-enum m_state_e m_state;
+static int NehGameType;
-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_Main_Draw (void);
- void M_SinglePlayer_Draw (void);
- void M_Transfusion_Episode_Draw (void);
- void M_Transfusion_Skill_Draw (void);
- void M_Load_Draw (void);
- void M_Save_Draw (void);
- void M_MultiPlayer_Draw (void);
- void M_Setup_Draw (void);
- void M_Options_Draw (void);
- void M_Options_Effects_Draw (void);
- void M_Options_Graphics_Draw (void);
- void M_Options_ColorControl_Draw (void);
- void M_Keys_Draw (void);
- void M_Reset_Draw (void);
- void M_Video_Draw (void);
- void M_Help_Draw (void);
- void M_Credits_Draw (void);
- void M_Quit_Draw (void);
-void M_LanConfig_Draw (void);
-void M_GameOptions_Draw (void);
-void M_ServerList_Draw (void);
-
-void M_Main_Key (int key, char ascii);
- void M_SinglePlayer_Key (int key, char ascii);
- void M_Transfusion_Episode_Key (int key, char ascii);
- void M_Transfusion_Skill_Key (int key, char ascii);
- void M_Load_Key (int key, char ascii);
- void M_Save_Key (int key, char ascii);
- void M_MultiPlayer_Key (int key, char ascii);
- void M_Setup_Key (int key, char ascii);
- void M_Options_Key (int key, char ascii);
- void M_Options_Effects_Key (int key, char ascii);
- void M_Options_Graphics_Key (int key, char ascii);
- void M_Options_ColorControl_Key (int key, char ascii);
- void M_Keys_Key (int key, char ascii);
- void M_Reset_Key (int key, char ascii);
- void M_Video_Key (int key, char ascii);
- void M_Help_Key (int key, char ascii);
- void M_Credits_Key (int key, char ascii);
- void M_Quit_Key (int key, char ascii);
-void M_LanConfig_Key (int key, char ascii);
-void M_GameOptions_Key (int key, char ascii);
-void M_ServerList_Key (int key, char ascii);
-
-qboolean m_entersound; // play after drawing a frame, so caching
- // won't disrupt the sound
-
-char m_return_reason [32];
-
-void M_Update_Return_Reason(char *s)
+enum m_state_e m_state;
+char m_return_reason[128];
+
+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);
+ static void M_Transfusion_Episode_Draw (void);
+ static void M_Transfusion_Skill_Draw (void);
+ static void M_Load_Draw (void);
+ static void M_Save_Draw (void);
+ static void M_MultiPlayer_Draw (void);
+ static void M_Setup_Draw (void);
+ static void M_Options_Draw (void);
+ static void M_Options_Effects_Draw (void);
+ static void M_Options_Graphics_Draw (void);
+ static void M_Options_ColorControl_Draw (void);
+ static void M_Keys_Draw (void);
+ static void M_Reset_Draw (void);
+ static void M_Video_Draw (void);
+ static void M_Help_Draw (void);
+ static void M_Credits_Draw (void);
+ static void M_Quit_Draw (void);
+static void M_LanConfig_Draw (void);
+static void M_GameOptions_Draw (void);
+static void M_ServerList_Draw (void);
+static void M_ModList_Draw (void);
+
+
+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)
{
strlcpy(m_return_reason, s, sizeof(m_return_reason));
if (s)
- Con_Printf("%s\n", s);
+ Con_DPrintf("%s\n", s);
}
#define StartingGame (m_multiplayer_cursor == 1)
#define NumberOfNehahraDemos 34
typedef struct nehahrademonames_s
{
- char *name;
- char *desc;
+ const char *name;
+ const char *desc;
} nehahrademonames_t;
-nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
+static nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
{
{"intro", "Prologue"},
{"genf", "The Beginning"},
{"seal", "The Seal is Broken"}
};
-float menu_x, menu_y, menu_width, menu_height;
+static float menu_x, menu_y, menu_width, menu_height;
-void M_Background(int width, int height)
+static void M_Background(int width, int height)
{
- menu_width = bound(1, width, vid_conwidth.integer);
- menu_height = bound(1, height, vid_conheight.integer);
+ menu_width = bound(1.0f, (float)width, vid_conwidth.value);
+ menu_height = bound(1.0f, (float)height, vid_conheight.value);
menu_x = (vid_conwidth.integer - menu_width) * 0.5;
menu_y = (vid_conheight.integer - menu_height) * 0.5;
- //DrawQ_Pic(menu_x, menu_y, NULL, menu_width, menu_height, 0, 0, 0, 0.5, 0);
- DrawQ_Pic(0, 0, NULL, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0);
+ //DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
+ DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0);
}
/*
Draws one solid graphics character
================
*/
-void M_DrawCharacter (float cx, float cy, int num)
+static void M_DrawCharacter (float cx, float cy, int num)
{
char temp[2];
temp[0] = num;
temp[1] = 0;
- DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
+ DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
}
-void M_PrintColored(float cx, float cy, const char *str)
+static void M_PrintColored(float cx, float cy, const char *str)
{
- DrawQ_ColoredString(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
}
-void M_Print(float cx, float cy, const char *str)
+static void M_Print(float cx, float cy, const char *str)
{
- DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
}
-void M_PrintRed (float cx, float cy, const char *str)
+static void M_PrintRed(float cx, float cy, const char *str)
{
- DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
}
-void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
+static void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
{
if (unghosted)
- DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
else
- DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0);
-}
-
-void M_DrawPic (float cx, float cy, const char *picname)
-{
- DrawQ_Pic (menu_x + cx, menu_y + cy, Draw_CachePic(picname, false), 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true, FONT_MENU);
}
-unsigned char identityTable[256];
-unsigned char translationTable[256];
-
-void M_BuildTranslationTable(int top, int bottom)
+static void M_DrawPic(float cx, float cy, const char *picname)
{
- int j;
- unsigned char *dest, *source;
-
- for (j = 0; j < 256; j++)
- identityTable[j] = j;
- dest = translationTable;
- source = identityTable;
- memcpy (dest, source, 256);
-
- // LordHavoc: corrected skin color ranges
- if (top < 128 || (top >= 224 && top < 240)) // the artists made some backwards ranges. sigh.
- memcpy (dest + TOP_RANGE, source + top, 16);
- else
- for (j=0 ; j<16 ; j++)
- dest[TOP_RANGE+j] = source[top+15-j];
-
- // LordHavoc: corrected skin color ranges
- if (bottom < 128 || (bottom >= 224 && bottom < 240))
- memcpy (dest + BOTTOM_RANGE, source + bottom, 16);
- else
- for (j=0 ; j<16 ; j++)
- dest[BOTTOM_RANGE+j] = source[bottom+15-j];
+ DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic (picname), 0, 0, 1, 1, 1, 1, 0);
}
-
-void M_DrawTextBox (float x, float y, float width, float height)
+static void M_DrawTextBox(float x, float y, float width, float height)
{
int n;
float cx, cy;
/*
================
-M_ToggleMenu_f
+M_ToggleMenu
================
*/
-void M_ToggleMenu_f (void)
+static void M_ToggleMenu(int mode)
{
m_entersound = true;
- if (key_dest != key_menu || m_state != m_main)
- M_Menu_Main_f ();
+ if ((key_dest != key_menu && key_dest != key_menu_grabbed) || m_state != m_main)
+ {
+ if(mode == 0)
+ return; // the menu is off, and we want it off
+ M_Menu_Main_f (cmd_local);
+ }
else
{
+ if(mode == 1)
+ return; // the menu is on, and we want it on
key_dest = key_game;
m_state = m_none;
}
}
-int demo_cursor;
-void M_Demo_Draw (void)
+static int demo_cursor;
+static void M_Demo_Draw (void)
{
int i;
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;
m_entersound = true;
}
-void M_Demo_Key (int k, char 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:
//=============================================================================
/* MAIN MENU */
-int m_main_cursor;
+static int m_main_cursor;
+static qbool m_missingdata = false;
-int MAIN_ITEMS = 4; // Nehahra: Menu Disable
+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";
+
if (gamemode == GAME_NEHAHRA)
{
+ if (FS_FileExists("maps/neh1m4.bsp"))
+ {
+ if (FS_FileExists("hearing.dem"))
+ {
+ Con_DPrint("Main menu: Nehahra movie and game detected.\n");
+ NehGameType = TYPE_BOTH;
+ }
+ else
+ {
+ Con_DPrint("Nehahra game detected.\n");
+ NehGameType = TYPE_GAME;
+ }
+ }
+ else
+ {
+ if (FS_FileExists("hearing.dem"))
+ {
+ Con_DPrint("Nehahra movie detected.\n");
+ NehGameType = TYPE_DEMO;
+ }
+ else
+ {
+ Con_DPrint("Nehahra not found.\n");
+ NehGameType = TYPE_GAME; // could just complain, but...
+ }
+ }
if (NehGameType == TYPE_DEMO)
MAIN_ITEMS = 4;
else if (NehGameType == TYPE_GAME)
else
MAIN_ITEMS = 6;
}
- else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
- MAIN_ITEMS = 6;
- else if (gamemode == GAME_TRANSFUSION) {
+ else if (gamemode == GAME_TRANSFUSION)
+ {
+ s = "gfx/menu/mainmenu1";
if (sv.active && !cl.intermission && cl.islocalgame)
MAIN_ITEMS = 8;
else
MAIN_ITEMS = 7;
}
- else if (gamemode == GAME_NEXUIZ) {
- MAIN_ITEMS = 2;
- }
else
MAIN_ITEMS = 5;
+ // check if the game data is missing and use a different main menu if so
+ m_missingdata = !forceqmenu.integer && !Draw_IsPicLoaded(Draw_CachePic_Flags(s, CACHEPICFLAG_FAILONMISSING));
+ if (m_missingdata)
+ MAIN_ITEMS = 2;
+
/*
if (key_dest != key_menu)
{
}
-void M_Main_Draw (void)
+static void M_Main_Draw (void)
{
int f;
cachepic_t *p;
+ char vabuf[1024];
+
+ if (m_missingdata)
+ {
+ float y;
+ const char *s;
+ M_Background(640, 480); //fall back is always to 640x480, this makes it most readable at that.
+ y = 480/3-16;
+ s = "You have reached this menu due to missing or unlocatable content/data";M_PrintRed ((640-strlen(s)*8)*0.5, (480/3)-16, s);y+=8;
+ y+=8;
+ s = "You may consider adding";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8;
+ s = "-basedir /path/to/game";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8;
+ s = "to your launch commandline";M_Print ((640-strlen(s)*8)*0.5, y, s);y+=8;
+ M_Print (640/2 - 48, 480/2, "Open Console"); //The console usually better shows errors (failures)
+ M_Print (640/2 - 48, 480/2 + 8, "Quit");
+ M_DrawCharacter(640/2 - 56, 480/2 + (8 * m_main_cursor), 12+((int)(host.realtime*4)&1));
+ return;
+ }
if (gamemode == GAME_TRANSFUSION) {
int y1, y2, y3;
M_Background(640, 480);
- p = Draw_CachePic ("gfx/menu/tb-transfusion", false);
- M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-transfusion");
+ p = Draw_CachePic ("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));
- return;
- }
- else if (gamemode == GAME_NEXUIZ)
- {
- M_Background(640, 480); //fall back is always to 640x480, this makes it most readable at that.
- M_PrintRed (40, (480/3)-16, "You have reached this menu due to missing or unlocatable content/data");
- M_Print ((640/2)-92, (480/3), "You may consider adding");
- M_Print ((640/2)-136, (480/3)+8, "-basedir /path/to/nexuiz");
- M_Print ((640/2)-76, (480/3)+16, "to your launch commandline");
- M_Print (640/2 - 48, 480/2, "Open Console"); //The console usually better shows errors (failures)
- M_Print (640/2 - 48, 480/2 + 8, "Quit");
- M_DrawCharacter(640/2 - 56, 480/2 + (8 * m_main_cursor), 12+((int)(realtime*4)&1));
+ 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", false);
- M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main");
+ p = Draw_CachePic ("gfx/ttl_main");
+ M_DrawPic ( (320-Draw_GetPicWidth(p))/2, 4, "gfx/ttl_main");
// Nehahra
if (gamemode == GAME_NEHAHRA)
{
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));
}
-void M_Main_Key (int key, char ascii)
+static void M_Main_Key(cmd_state_t *cmd, int key, int ascii)
{
switch (key)
{
case K_ENTER:
m_entersound = true;
- if (gamemode == GAME_NEHAHRA)
+ if (m_missingdata)
+ {
+ switch (m_main_cursor)
+ {
+ case 0:
+ if (cls.state == ca_connected)
+ {
+ m_state = m_none;
+ key_dest = key_game;
+ }
+ Con_ToggleConsole_f(cmd);
+ break;
+ case 1:
+ M_Menu_Quit_f(cmd);
+ break;
+ }
+ }
+ else if (gamemode == GAME_NEHAHRA)
{
switch (NehGameType)
{
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;
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;
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;
}
}
- else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
- {
- switch (m_main_cursor)
- {
- case 0:
- M_Menu_SinglePlayer_f ();
- break;
-
- case 1:
- M_Menu_MultiPlayer_f ();
- break;
-
- case 2:
- M_Menu_Options_f ();
- break;
-
- case 3:
- M_Menu_Help_f ();
- break;
-
- case 4:
- M_Menu_Quit_f ();
- break;
- case 5:
- MR_Restart();
- break;
- }
- }
else if (gamemode == GAME_TRANSFUSION) {
if (MAIN_ITEMS == 7)
{
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;
}
}
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;
}
}
}
- else if (gamemode == GAME_NEXUIZ) {
- switch (m_main_cursor)
- {
- case 0:
- if (cls.state == ca_connected)
- {
- m_state = m_none;
- key_dest = key_game;
- }
- Con_ToggleConsole_f ();
- break;
- case 1:
- M_Menu_Quit_f ();
- break;
- }
- }
else
{
switch (m_main_cursor)
{
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;
}
}
//=============================================================================
/* SINGLE PLAYER MENU */
-int m_singleplayer_cursor;
+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;
}
-void M_SinglePlayer_Draw (void)
+static void M_SinglePlayer_Draw (void)
{
cachepic_t *p;
+ char vabuf[1024];
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/ttl_sgl", false);
+ p = Draw_CachePic ("gfx/ttl_sgl");
// 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)
{
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));
}
}
-void M_SinglePlayer_Key (int key, char ascii)
+static void M_SinglePlayer_Key(cmd_state_t *cmd, int key, int ascii)
{
if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
{
switch (key)
{
case K_ESCAPE:
- M_Menu_Main_f ();
+ M_Menu_Main_f(cmd);
break;
case K_DOWNARROW:
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;
}
}
//=============================================================================
/* LOAD/SAVE MENU */
-int load_cursor; // 0 < load_cursor < MAX_SAVEGAMES
+static int load_cursor; ///< 0 < load_cursor < MAX_SAVEGAMES
-#define MAX_SAVEGAMES 12
-char m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1];
-int loadable[MAX_SAVEGAMES];
+static char m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1];
+static int loadable[MAX_SAVEGAMES];
-void M_ScanSaves (void)
+static void M_ScanSaves (void)
{
- int i, j, len;
+ int i, j;
+ size_t len;
char name[MAX_OSPATH];
char buf[SAVEGAME_COMMENT_LENGTH + 256];
const char *t;
qfile_t *f;
- int version;
+// int version;
for (i=0 ; i<MAX_SAVEGAMES ; i++)
{
- strcpy (m_filenames[i], "--- UNUSED SLOT ---");
+ strlcpy (m_filenames[i], "--- UNUSED SLOT ---", sizeof(m_filenames[i]));
loadable[i] = false;
- sprintf (name, "s%i.sav", (int)i);
- f = FS_Open (name, "rb", false, false);
+ dpsnprintf (name, sizeof(name), "s%i.sav", (int)i);
+ f = FS_OpenRealFile (name, "rb", false);
if (!f)
continue;
// read enough to get the comment
len = FS_Read(f, buf, sizeof(buf) - 1);
- buf[sizeof(buf) - 1] = 0;
+ len = min(len, sizeof(buf)-1);
+ buf[len] = 0;
t = buf;
// version
- COM_ParseToken(&t, false);
- version = atoi(com_token);
+ COM_ParseToken_Simple(&t, false, false, true);
+ //version = atoi(com_token);
// description
- COM_ParseToken(&t, false);
+ COM_ParseToken_Simple(&t, false, false, true);
strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
// change _ back to space
}
}
-void M_Menu_Load_f (void)
+void M_Menu_Load_f(cmd_state_t *cmd)
{
m_entersound = true;
m_state = m_load;
}
-void M_Menu_Save_f (void)
+void M_Menu_Save_f(cmd_state_t *cmd)
{
if (!sv.active)
return;
+#if 1
+ // LadyHavoc: allow saving multiplayer games
+ if (cl.islocalgame && cl.intermission)
+ return;
+#else
if (cl.intermission)
return;
if (!cl.islocalgame)
return;
+#endif
m_entersound = true;
m_state = m_save;
key_dest = key_menu;
}
-void M_Load_Draw (void)
+static void M_Load_Draw (void)
{
int i;
cachepic_t *p;
M_Background(320, 200);
- p = Draw_CachePic ("gfx/p_load", false);
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load" );
+ p = Draw_CachePic ("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));
}
-void M_Save_Draw (void)
+static void M_Save_Draw (void)
{
int i;
cachepic_t *p;
M_Background(320, 200);
- p = Draw_CachePic ("gfx/p_save", false);
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save");
+ p = Draw_CachePic ("gfx/p_save");
+ M_DrawPic ( (320-Draw_GetPicWidth(p))/2, 4, "gfx/p_save");
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));
}
-void M_Load_Key (int k, char ascii)
+static void M_Load_Key(cmd_state_t *cmd, int k, int ascii)
{
+ char vabuf[1024];
switch (k)
{
case K_ESCAPE:
if (gamemode == GAME_TRANSFUSION)
- M_Menu_Main_f ();
+ M_Menu_Main_f(cmd);
else
- M_Menu_SinglePlayer_f ();
+ M_Menu_SinglePlayer_f(cmd);
break;
case K_ENTER:
key_dest = key_game;
// issue the load command
- Cbuf_AddText (va ("load s%i\n", load_cursor) );
+ Cbuf_AddText (cmd, va(vabuf, sizeof(vabuf), "load s%i\n", load_cursor) );
return;
case K_UPARROW:
}
-void M_Save_Key (int k, char ascii)
+static void M_Save_Key(cmd_state_t *cmd, int k, int ascii)
{
+ char vabuf[1024];
switch (k)
{
case K_ESCAPE:
if (gamemode == GAME_TRANSFUSION)
- M_Menu_Main_f ();
+ M_Menu_Main_f(cmd);
else
- M_Menu_SinglePlayer_f ();
+ M_Menu_SinglePlayer_f(cmd);
break;
case K_ENTER:
m_state = m_none;
key_dest = key_game;
- Cbuf_AddText (va("save s%i\n", load_cursor));
+ Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "save s%i\n", load_cursor));
return;
case K_UPARROW:
//=============================================================================
/* Transfusion Single Player Episode Menu */
-int m_episode_cursor;
+static int m_episode_cursor;
#define EPISODE_ITEMS 6
-void M_Menu_Transfusion_Episode_f (void)
+void M_Menu_Transfusion_Episode_f(cmd_state_t *cmd)
{
m_entersound = true;
m_state = m_transfusion_episode;
key_dest = key_menu;
}
-void M_Transfusion_Episode_Draw (void)
+static void M_Transfusion_Episode_Draw (void)
{
int y;
cachepic_t *p;
+ char vabuf[1024];
M_Background(640, 480);
- p = Draw_CachePic ("gfx/menu/tb-episodes", false);
- M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-episodes");
+ p = Draw_CachePic ("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));
}
-void M_Transfusion_Episode_Key (int key, char 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:
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);
}
}
//=============================================================================
/* Transfusion Single Player Skill Menu */
-int m_skill_cursor = 2;
+static int m_skill_cursor = 2;
#define SKILL_ITEMS 5
-void M_Menu_Transfusion_Skill_f (void)
+void M_Menu_Transfusion_Skill_f(cmd_state_t *cmd)
{
m_entersound = true;
m_state = m_transfusion_skill;
key_dest = key_menu;
}
-void M_Transfusion_Skill_Draw (void)
+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", false);
- M_DrawPic(640/2 - p->width/2, 40, "gfx/menu/tb-difficulty");
+ p = Draw_CachePic ("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));
}
-void M_Transfusion_Skill_Key (int key, char 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:
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;
}
}
//=============================================================================
/* MULTIPLAYER MENU */
-int m_multiplayer_cursor;
+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;
}
-void M_MultiPlayer_Draw (void)
+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", false);
- M_DrawPic (640/2 - p->width/2, 140, "gfx/menu/tb-online");
+ p = Draw_CachePic ("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", false);
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
+ p = Draw_CachePic ("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));
}
-void M_MultiPlayer_Key (int key, char 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:
{
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;
}
}
//=============================================================================
/* SETUP MENU */
-int setup_cursor = 4;
-int setup_cursor_table[] = {40, 64, 88, 124, 140};
+static int setup_cursor = 4;
+static int setup_cursor_table[] = {40, 64, 88, 124, 140};
-char setup_myname[32];
-int setup_oldtop;
-int setup_oldbottom;
-int setup_top;
-int setup_bottom;
-int setup_rate;
-int setup_oldrate;
+static char setup_myname[MAX_SCOREBOARDNAME];
+static int setup_oldtop;
+static int setup_oldbottom;
+static int setup_top;
+static int setup_bottom;
+static int setup_rate;
+static int setup_oldrate;
#define NUM_SETUP_CMDS 5
-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;
- strcpy(setup_myname, cl_name.string);
- setup_top = setup_oldtop = cl_color.integer >> 4;
- setup_bottom = setup_oldbottom = cl_color.integer & 15;
+ strlcpy(setup_myname, cl_name.string, sizeof(setup_myname));
+ setup_top = setup_oldtop = cl_topcolor.integer;
+ setup_bottom = setup_oldbottom = cl_bottomcolor.integer;
setup_rate = cl_rate.integer;
}
typedef struct ratetable_s
{
int rate;
- char *name;
+ const char *name;
}
ratetable_t;
return bound(1, i, RATES) - 1;
}
-void M_Setup_Draw (void)
+static void M_Setup_Draw (void)
{
- int i;
+ 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", false);
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
+ p = Draw_CachePic ("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);
}
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 *data, *f;
+ unsigned char *f;
fs_offset_t filesize;
menuplyr_load = false;
menuplyr_top = -1;
menuplyr_bottom = -1;
- if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize)))
+ f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize);
+ if (f && filesize >= 9)
{
- data = LoadLMP (f, filesize, 0, 0, true);
- menuplyr_width = image_width;
- menuplyr_height = image_height;
- Mem_Free(f);
- menuplyr_pixels = (unsigned char *)Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height);
- menuplyr_translated = (unsigned int *)Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height * 4);
- memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height);
- Mem_Free(data);
+ int width, height;
+ width = f[0] + f[1] * 256 + f[2] * 65536 + f[3] * 16777216;
+ height = f[4] + f[5] * 256 + f[6] * 65536 + f[7] * 16777216;
+ if (filesize >= 8 + width * height)
+ {
+ menuplyr_width = width;
+ menuplyr_height = height;
+ menuplyr_pixels = (unsigned char *)Mem_Alloc(cls.permanentmempool, width * height);
+ menuplyr_translated = (unsigned int *)Mem_Alloc(cls.permanentmempool, width * height * 4);
+ memcpy(menuplyr_pixels, f + 8, width * height);
+ }
}
+ if (f)
+ Mem_Free(f);
}
if (menuplyr_pixels)
{
menuplyr_top = setup_top;
menuplyr_bottom = setup_bottom;
- M_BuildTranslationTable(menuplyr_top*16, menuplyr_bottom*16);
+
for (i = 0;i < menuplyr_width * menuplyr_height;i++)
- menuplyr_translated[i] = palette_transparent[translationTable[menuplyr_pixels[i]]];
- Draw_NewPic("gfx/menuplyr", menuplyr_width, menuplyr_height, true, (unsigned char *)menuplyr_translated);
+ {
+ j = menuplyr_pixels[i];
+ if (j >= TOP_RANGE && j < TOP_RANGE + 16)
+ {
+ if (menuplyr_top < 8 || menuplyr_top == 14)
+ j = menuplyr_top * 16 + (j - TOP_RANGE);
+ else
+ j = menuplyr_top * 16 + 15-(j - TOP_RANGE);
+ }
+ else if (j >= BOTTOM_RANGE && j < BOTTOM_RANGE + 16)
+ {
+ if (menuplyr_bottom < 8 || menuplyr_bottom == 14)
+ j = menuplyr_bottom * 16 + (j - BOTTOM_RANGE);
+ else
+ j = menuplyr_bottom * 16 + 15-(j - BOTTOM_RANGE);
+ }
+ menuplyr_translated[i] = palette_bgra_transparent[j];
+ }
+ 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));
}
-void M_Setup_Key (int k, char 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:
// 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:
#define SLIDER_RANGE 10
-void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
+static void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
{
char text[16];
int i;
M_DrawCharacter (x+i*8, y, 130);
M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131);
if (fabs((int)num - num) < 0.01)
- sprintf(text, "%i", (int)num);
+ dpsnprintf(text, sizeof(text), "%i", (int)num);
else
- sprintf(text, "%.2f", num);
+ dpsnprintf(text, sizeof(text), "%.3f", num);
M_Print(x + (SLIDER_RANGE+2) * 8, y, text);
}
-void M_DrawCheckbox (int x, int y, int on)
+static void M_DrawCheckbox (int x, int y, int on)
{
if (on)
M_Print(x, y, "on");
}
-#define OPTIONS_ITEMS 40
+//#define OPTIONS_ITEMS 25 aule was here
+#define OPTIONS_ITEMS 27
+
-int options_cursor;
+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;
+extern cvar_t r_hdr_scenebrightness;
-void M_Menu_Options_AdjustSliders (int dir)
+static void M_Menu_Options_AdjustSliders (int dir)
{
int optnum;
+ double f;
S_LocalSound ("sound/misc/menu3.wav");
- optnum = 7;
- if (options_cursor == optnum++)
- Cvar_SetValueQuick (&vid_conwidth, bound(320, vid_conwidth.value + dir * 64, 2048));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&vid_conheight, bound(240, vid_conheight.value + dir * 48, 1536));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_conspeed, bound(0, scr_conspeed.value + dir * 100, 1000));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_conalpha, bound(0, scr_conalpha.value + dir * 0.2, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_conbrightness, bound(0, scr_conbrightness.value + dir * 0.2, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&sbar_alpha_bg, bound(0, sbar_alpha_bg.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&sbar_alpha_fg, bound(0, sbar_alpha_fg.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_fov, bound(1, scr_fov.integer + dir * 1, 170));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_screenshot_jpeg, !scr_screenshot_jpeg.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&scr_screenshot_gamma, bound(0.1, scr_screenshot_gamma.value + dir * 0.1, 4));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&r_sky, !r_sky.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.integer + dir, gl_max_anisotropy));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&snd_staticvolume, bound(0, snd_staticvolume.value + dir * 0.1, 1));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&r_textshadow, !r_textshadow.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 6));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&showfps, !showfps.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&showtime, !showtime.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&showdate, !showdate.integer);
+ optnum = 0;
+ if (options_cursor == optnum++) ;
+ else if (options_cursor == optnum++) ;
+ else if (options_cursor == optnum++) ;
+ else if (options_cursor == optnum++) ;
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&crosshair, bound(0, crosshair.integer + dir, 7));
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&m_pitch, -m_pitch.value);
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&scr_fov, bound(1, scr_fov.integer + dir * 1, 170));
else if (options_cursor == optnum++)
{
if (cl_forwardspeed.value > 200)
Cvar_SetValueQuick (&cl_backspeed, 400);
}
}
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&lookspring, !lookspring.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&freelook, !freelook.integer);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
- else if (options_cursor == optnum++)
- Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
+ 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));
+ 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));
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&bgmvolume, bound(0, bgmvolume.value + dir * 0.0625, 1));
}
-int optnum;
-int opty;
-int optcursor;
+static int m_optnum;
+static int m_opty;
+static int m_optcursor;
-void M_Options_PrintCommand(const char *s, int enabled)
+static void M_Options_PrintCommand(const char *s, int enabled)
{
- if (opty >= 32)
+ if (m_opty >= 32)
{
- DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
- M_ItemPrint(0, opty, s, enabled);
+ 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++;
}
-void M_Options_PrintCheckbox(const char *s, int enabled, int yes)
+static void M_Options_PrintCheckbox(const char *s, int enabled, int yes)
{
- if (opty >= 32)
+ if (m_opty >= 32)
{
- DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
- M_ItemPrint(0, opty, s, enabled);
- M_DrawCheckbox(0 + (int)strlen(s) * 8 + 8, opty, yes);
+ 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++;
}
-void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue)
+static void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue)
{
- if (opty >= 32)
+ if (m_opty >= 32)
{
- DrawQ_Pic(menu_x, menu_y + opty, NULL, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
- M_ItemPrint(0, opty, s, enabled);
- M_DrawSlider(0 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
+ 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++;
}
-void M_Options_Draw (void)
+static void M_Options_Draw (void)
{
int visible;
cachepic_t *p;
M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", false);
- M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
+ p = Draw_CachePic ("gfx/p_option");
+ M_DrawPic((320-Draw_GetPicWidth(p))/2, 4, "gfx/p_option");
- optnum = 0;
- optcursor = options_cursor;
- visible = (menu_height - 32) / 8;
- opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_ITEMS - visible)) * 8;
-
- M_Options_PrintCommand( "Customize controls", true);
- M_Options_PrintCommand( " Go to console", true);
- M_Options_PrintCommand( " Reset to defaults", true);
- M_Options_PrintCommand( " Video", true);
- M_Options_PrintCommand( " Effects", true);
- M_Options_PrintCommand( " Graphics", true);
- M_Options_PrintCommand( " Color Control", true);
- M_Options_PrintSlider( " 2D Screen Width ", true, vid_conwidth.value, 320, 2048);
- M_Options_PrintSlider( " 2D Screen Height", true, vid_conheight.value, 240, 1536);
- M_Options_PrintSlider( " Console Speed", true, scr_conspeed.value, 0, 1000);
- M_Options_PrintSlider( " Console Alpha", true, scr_conalpha.value, 0, 1);
- M_Options_PrintSlider( "Conback Brightness", true, scr_conbrightness.value, 0, 1);
- M_Options_PrintSlider( " Sbar Alpha BG", true, sbar_alpha_bg.value, 0, 1);
- M_Options_PrintSlider( " Sbar Alpha FG", true, sbar_alpha_fg.value, 0, 1);
- M_Options_PrintSlider( " Screen size", true, scr_viewsize.value, 30, 120);
- M_Options_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170);
- M_Options_PrintCheckbox(" JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer);
- M_Options_PrintSlider( " JPEG quality", jpeg_dll != NULL, scr_screenshot_jpeg_quality.value, 0, 1);
- M_Options_PrintSlider( " Screenshot Gamma", jpeg_dll != NULL, scr_screenshot_gamma.value, 0.1, 4);
- M_Options_PrintCheckbox(" Sky", true, r_sky.integer);
- M_Options_PrintCheckbox(" Dithering", true, gl_dither.integer);
- M_Options_PrintSlider( "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
- M_Options_PrintSlider( " Game Speed", sv.active, slowmo.value, 0, 5);
- M_Options_PrintSlider( " CD Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
- M_Options_PrintSlider( " Sound Volume", snd_initialized.integer, volume.value, 0, 1);
- M_Options_PrintSlider(gamemode == GAME_GOODVSBAD2 ? " Music Volume" : " Ambient Volume", snd_initialized.integer, snd_staticvolume.value, 0, 1);
- M_Options_PrintCheckbox(" Text Shadow", true, r_textshadow.integer);
- M_Options_PrintSlider( " Crosshair", true, crosshair.value, 0, 5);
- M_Options_PrintSlider( " Crosshair Size", true, crosshair_size.value, 1, 5);
- M_Options_PrintCheckbox(" Static Crosshair", true, crosshair_static.integer);
- M_Options_PrintCheckbox(" Show Framerate", true, showfps.integer);
- M_Options_PrintCheckbox(" Show Time", true, showtime.integer);
- M_Options_PrintCheckbox(" Show Date", true, showdate.integer);
- M_Options_PrintCheckbox(" Always Run", true, cl_forwardspeed.value > 200);
- M_Options_PrintCheckbox(" Lookspring", true, lookspring.integer);
- M_Options_PrintCheckbox(" Lookstrafe", true, lookstrafe.integer);
- M_Options_PrintSlider( " Mouse Speed", true, sensitivity.value, 1, 50);
- M_Options_PrintCheckbox(" Mouse Look", true, freelook.integer);
- M_Options_PrintCheckbox(" Invert Mouse", true, m_pitch.value < 0);
- M_Options_PrintCheckbox(" Use Mouse", true, vid_mouse.integer);
-}
-
-
-void M_Options_Key (int k, char ascii)
+ m_optnum = 0;
+ m_optcursor = options_cursor;
+ visible = (int)((menu_height - 32) / 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);
+ M_Options_PrintCommand( " Reset to defaults", true);
+ M_Options_PrintCommand( " Change Video Mode", true);
+ M_Options_PrintSlider( " Crosshair", true, crosshair.value, 0, 7);
+ M_Options_PrintSlider( " Mouse Speed", true, sensitivity.value, 1, 50);
+ 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, 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);
+ M_Options_PrintSlider( " Gamma", true, v_gamma.value, 0.5, 3);
+ M_Options_PrintSlider( " Sound Volume", snd_initialized.integer, volume.value, 0, 1);
+ M_Options_PrintSlider( " Music Volume", cdaudioinitialized.integer, bgmvolume.value, 0, 1);
+ M_Options_PrintCommand( " Customize Effects", true);
+ M_Options_PrintCommand( " Effects: Quake", true);
+ M_Options_PrintCommand( " Effects: Normal", true);
+ M_Options_PrintCommand( " Effects: High", true);
+ M_Options_PrintCommand( " Customize Lighting", true);
+ M_Options_PrintCommand( " Lighting: Flares", true);
+ M_Options_PrintCommand( " Lighting: Normal", true);
+ M_Options_PrintCommand( " Lighting: High", true);
+ M_Options_PrintCommand( " Lighting: Full", true);
+ M_Options_PrintCommand( " Browse Mods", true);
+}
+
+
+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:
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 4:
- M_Menu_Options_Effects_f ();
+ case 11:
+ M_Menu_Options_ColorControl_f(cmd);
break;
- case 5:
- M_Menu_Options_Graphics_f ();
+ case 17: // Customize Effects
+ M_Menu_Options_Effects_f(cmd);
+ break;
+ case 18: // Effects: Quake
+ 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(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 6:
- M_Menu_Options_ColorControl_f ();
+ case 20: // Effects: High
+ 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(cmd);
+ break;
+ case 22: // Lighting: Flares
+ 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(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(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(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(cmd);
break;
default:
M_Menu_Options_AdjustSliders (1);
#define OPTIONS_EFFECTS_ITEMS 35
-int options_effects_cursor;
+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;
extern cvar_t r_explosionclip;
extern cvar_t r_coronas;
extern cvar_t gl_flashblend;
-extern cvar_t cl_beams_polygon;
-extern cvar_t cl_beams_relative;
+extern cvar_t cl_beams_polygons;
+extern cvar_t cl_beams_quakepositionhack;
+extern cvar_t cl_beams_instantaimhack;
extern cvar_t cl_beams_lightatend;
extern cvar_t r_lightningbeam_thickness;
extern cvar_t r_lightningbeam_scroll;
extern cvar_t r_lightningbeam_color_blue;
extern cvar_t r_lightningbeam_qmbtexture;
-void M_Menu_Options_Effects_AdjustSliders (int dir)
+static void M_Menu_Options_Effects_AdjustSliders (int dir)
{
int optnum;
S_LocalSound ("sound/misc/menu3.wav");
optnum = 0;
- if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
- else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
- else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
+ if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles, !cl_particles.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quake, !cl_particles_quake.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_quality, bound(1, cl_particles_quality.value + dir * 0.5, 4));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_explosions_shell, !cl_particles_explosions_shell.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_alpha, bound(0.2, cl_particles_blood_alpha.value + dir * 0.1, 1));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_polygons, !cl_beams_polygons.integer);
- else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_relative, !cl_beams_relative.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_instantaimhack, !cl_beams_instantaimhack.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_quakepositionhack, !cl_beams_quakepositionhack.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_beams_lightatend, !cl_beams_lightatend.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_thickness, bound(1, r_lightningbeam_thickness.integer + dir, 10));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_scroll, bound(0, r_lightningbeam_scroll.integer + dir, 10));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lightningbeam_qmbtexture, !r_lightningbeam_qmbtexture.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpmodels, !r_lerpmodels.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpsprites, !r_lerpsprites.integer);
+ else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerplightstyles, !r_lerplightstyles.integer);
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&gl_polyblend, bound(0, gl_polyblend.value + dir * 0.1, 1));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_skyscroll1, bound(-8, r_skyscroll1.value + dir * 0.1, 8));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_skyscroll2, bound(-8, r_skyscroll2.value + dir * 0.1, 8));
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10));
}
-void M_Options_Effects_Draw (void)
+static void M_Options_Effects_Draw (void)
{
int visible;
cachepic_t *p;
M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", false);
- M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
+ p = Draw_CachePic ("gfx/p_option");
+ M_DrawPic((320-Draw_GetPicWidth(p))/2, 4, "gfx/p_option");
- optcursor = options_effects_cursor;
- optnum = 0;
- visible = (menu_height - 32) / 8;
- opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8;
+ m_optcursor = options_effects_cursor;
+ m_optnum = 0;
+ visible = (int)((menu_height - 32) / 8);
+ m_opty = 32 - bound(0, m_optcursor - (visible >> 1), max(0, OPTIONS_EFFECTS_ITEMS - visible)) * 8;
- M_Options_PrintSlider( " Corona Intensity", true, r_coronas.value, 0, 4);
- M_Options_PrintCheckbox(" Use Only Coronas", true, gl_flashblend.integer);
M_Options_PrintCheckbox(" Particles", true, cl_particles.integer);
M_Options_PrintCheckbox(" Quake-style Particles", true, cl_particles_quake.integer);
M_Options_PrintSlider( " Particles Quality", true, cl_particles_quality.value, 1, 4);
M_Options_PrintCheckbox(" Blood", true, cl_particles_blood.integer);
M_Options_PrintSlider( " Blood Opacity", true, cl_particles_blood_alpha.value, 0.2, 1);
M_Options_PrintCheckbox("Force New Blood Effect", true, cl_particles_blood_bloodhack.integer);
- M_Options_PrintCheckbox(" Lightning Polygons", true, cl_beams_polygons.integer);
- M_Options_PrintCheckbox("Lightning Smooth Sweep", true, cl_beams_relative.integer);
+ M_Options_PrintCheckbox(" Polygon Lightning", true, cl_beams_polygons.integer);
+ M_Options_PrintCheckbox("Smooth Sweep Lightning", true, cl_beams_instantaimhack.integer);
+ M_Options_PrintCheckbox(" Waist-level Lightning", true, cl_beams_quakepositionhack.integer);
M_Options_PrintCheckbox(" Lightning End Light", true, cl_beams_lightatend.integer);
M_Options_PrintSlider( " Lightning Thickness", cl_beams_polygons.integer, r_lightningbeam_thickness.integer, 1, 10);
M_Options_PrintSlider( " Lightning Scroll", cl_beams_polygons.integer, r_lightningbeam_scroll.integer, 0, 10);
M_Options_PrintCheckbox(" Lightning QMB Texture", cl_beams_polygons.integer, r_lightningbeam_qmbtexture.integer);
M_Options_PrintCheckbox(" Model Interpolation", true, r_lerpmodels.integer);
M_Options_PrintCheckbox(" Sprite Interpolation", true, r_lerpsprites.integer);
+ M_Options_PrintCheckbox(" Flicker Interpolation", true, r_lerplightstyles.integer);
M_Options_PrintSlider( " View Blend", true, gl_polyblend.value, 0, 1);
M_Options_PrintSlider( "Upper Sky Scroll Speed", true, r_skyscroll1.value, -8, 8);
M_Options_PrintSlider( "Lower Sky Scroll Speed", true, r_skyscroll2.value, -8, 8);
}
-void M_Options_Effects_Key (int k, char 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:
}
-#define OPTIONS_GRAPHICS_ITEMS 14
+#define OPTIONS_GRAPHICS_ITEMS 20
-int options_graphics_cursor;
+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;
extern cvar_t r_shadow_realtime_dlight;
extern cvar_t r_shadow_realtime_dlight_shadows;
extern cvar_t r_shadow_realtime_world;
-extern cvar_t r_shadow_realtime_world_dlightshadows;
extern cvar_t r_shadow_realtime_world_lightmaps;
extern cvar_t r_shadow_realtime_world_shadows;
extern cvar_t r_bloom;
-extern cvar_t r_bloom_intensity;
-extern cvar_t r_bloom_power;
+extern cvar_t r_bloom_colorscale;
+extern cvar_t r_bloom_colorsubtract;
+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_scenebrightness;
+extern cvar_t r_hdr_glowintensity;
extern cvar_t gl_picmip;
-void M_Menu_Options_Graphics_AdjustSliders (int dir)
+static void M_Menu_Options_Graphics_AdjustSliders (cmd_state_t *cmd, int dir)
{
int optnum;
S_LocalSound ("sound/misc/menu3.wav");
optnum = 0;
- if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss, bound(0, r_shadow_gloss.integer + dir, 2));
+ if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_coronas, bound(0, r_coronas.value + dir * 0.125, 4));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&gl_flashblend, !gl_flashblend.integer);
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_gloss, bound(0, r_shadow_gloss.integer + dir, 2));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight, !r_shadow_realtime_dlight.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight_shadows, !r_shadow_realtime_dlight_shadows.integer);
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_dlightshadows, !r_shadow_realtime_world_dlightshadows.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps, bound(0, r_shadow_realtime_world_lightmaps.value + dir * 0.1, 1));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_shadows, !r_shadow_realtime_world_shadows.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom, !r_bloom.integer);
- else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_intensity, bound(1, r_bloom_intensity.value + dir * 1, 16));
- else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_power, bound(1, r_bloom_power.value + dir * 1, 16));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_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));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorexponent, bound(1, r_bloom_colorexponent.value * (dir > 0 ? 2.0 : 0.5), 8));
+ 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++) Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
- else if (options_graphics_cursor == optnum++) Cbuf_AddText ("r_restart\n");
+ else if (options_graphics_cursor == optnum++) Cbuf_AddText(cmd, "r_restart\n");
}
-void M_Options_Graphics_Draw (void)
+static void M_Options_Graphics_Draw (void)
{
int visible;
cachepic_t *p;
M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", false);
- M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
+ p = Draw_CachePic ("gfx/p_option");
+ M_DrawPic((320-Draw_GetPicWidth(p))/2, 4, "gfx/p_option");
- optcursor = options_graphics_cursor;
- optnum = 0;
- visible = (menu_height - 32) / 8;
- opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8;
+ m_optcursor = options_graphics_cursor;
+ m_optnum = 0;
+ visible = (int)((menu_height - 32) / 8);
+ m_opty = 32 - bound(0, m_optcursor - (visible >> 1), max(0, OPTIONS_GRAPHICS_ITEMS - visible)) * 8;
- M_Options_PrintSlider( " Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
- M_Options_PrintCheckbox(" RT DLights", true, r_shadow_realtime_dlight.integer);
- M_Options_PrintCheckbox(" RT DLight Shadows", true, r_shadow_realtime_dlight_shadows.integer);
- M_Options_PrintCheckbox(" RT World", true, r_shadow_realtime_world.integer);
- M_Options_PrintCheckbox("RT World DLight Shadows", true, r_shadow_realtime_world_dlightshadows.integer);
- M_Options_PrintSlider( " RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1);
- M_Options_PrintCheckbox(" RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
- M_Options_PrintCheckbox(" Bloom Effect", true, r_bloom.integer);
- M_Options_PrintSlider( " Bloom Intensity", true, r_bloom_intensity.value, 1, 16);
- M_Options_PrintSlider( " Bloom Power", true, r_bloom_power.value, 1, 16);
- M_Options_PrintSlider( " Bloom Blur", true, r_bloom_blur.value, 1, 16);
- M_Options_PrintSlider( " Bloom Resolution", true, r_bloom_resolution.value, 64, 2048);
- M_Options_PrintSlider( " Texture Quality", true, gl_picmip.value, 3, 0);
- M_Options_PrintCommand( " Restart Renderer", true);
+ M_Options_PrintSlider( " Corona Intensity", true, r_coronas.value, 0, 4);
+ M_Options_PrintCheckbox(" Use Only Coronas", true, gl_flashblend.integer);
+ M_Options_PrintSlider( " Gloss Mode", true, r_shadow_gloss.integer, 0, 2);
+ M_Options_PrintCheckbox(" RT DLights", !gl_flashblend.integer, r_shadow_realtime_dlight.integer);
+ M_Options_PrintCheckbox(" RT DLight Shadows", !gl_flashblend.integer, r_shadow_realtime_dlight_shadows.integer);
+ 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_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);
}
-void M_Options_Graphics_Key (int k, char 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:
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;
}
}
#define OPTIONS_COLORCONTROL_ITEMS 18
-int options_colorcontrol_cursor;
+static int options_colorcontrol_cursor;
// intensity value to match up to 50% dither to 'correct' quake
-cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25", "intensity value that matches up to white/black dither pattern, due to Quake's grey level being quite dark this is 0.25, other games may use other values"};
+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;
}
-void M_Menu_Options_ColorControl_AdjustSliders (int dir)
+static void M_Menu_Options_ColorControl_AdjustSliders (int dir)
{
int optnum;
float f;
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));
}
}
-void M_Options_ColorControl_Draw (void)
+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("gfx/colorcontrol/ditherpattern", false);
+ dither = Draw_CachePic_Flags ("gfx/colorcontrol/ditherpattern", CACHEPICFLAG_NOCLAMP);
M_Background(320, 256);
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", false);
- M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
+ p = Draw_CachePic ("gfx/p_option");
+ M_DrawPic((320-Draw_GetPicWidth(p))/2, 4, "gfx/p_option");
- optcursor = options_colorcontrol_cursor;
- optnum = 0;
- visible = (menu_height - 32) / 8;
- opty = 32 - bound(0, optcursor - (visible >> 1), max(0, OPTIONS_COLORCONTROL_ITEMS - visible)) * 8;
+ m_optcursor = options_colorcontrol_cursor;
+ m_optnum = 0;
+ visible = (int)((menu_height - 32) / 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);
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_Pic(menu_x, menu_y + opty, NULL, 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_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, c, 0, 0, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0);
+ 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_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, 0, c, 0, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0);
+ 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_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, 0, 0, c, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0);
+ 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_Pic(menu_x + x, menu_y + opty, NULL, 64, 48, c, c, c, 1, 0);
- DrawQ_SuperPic(menu_x + x + 16, menu_y + opty + 16, dither, 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);
- DrawQ_SuperPic(menu_x + x + 32, menu_y + opty + 16, dither, 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0);
+ 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);
}
-void M_Options_ColorControl_Key (int k, char 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:
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);
//=============================================================================
/* KEYS MENU */
-char *quakebindnames[][2] =
+static const char *quakebindnames[][2] =
{
{"+attack", "attack"},
{"impulse 10", "next weapon"},
{"+movedown", "swim down"}
};
-char *transfusionbindnames[][2] =
+static const char *transfusionbindnames[][2] =
{
{"", "Movement"}, // Movement commands
{"+forward", "walk forward"},
{"impulse 79", "taunt 9"}
};
-char *goodvsbad2bindnames[][2] =
+static const char *goodvsbad2bindnames[][2] =
{
{"impulse 69", "Power 1"},
{"impulse 70", "Power 2"},
{"+movedown", "swim down"}
};
-int numcommands;
-char *(*bindnames)[2];
+static int numcommands;
+static const char *(*bindnames)[2];
/*
typedef struct binditem_s
}
bindcategory_t;
-bindcategory_t *bindcategories = NULL;
+static bindcategory_t *bindcategories = NULL;
-void M_ClearBinds (void)
+static void M_ClearBinds (void)
{
for (c = bindcategories;c;c = cnext)
{
bindcategories = NULL;
}
-void M_AddBindToCategory(bindcategory_t *c, char *command, char *description)
+static void M_AddBindToCategory(bindcategory_t *c, char *command, char *description)
{
for (b = &c->binds;*b;*b = &(*b)->next);
*b = Z_Alloc(sizeof(binditem_t) + strlen(command) + 1 + strlen(description) + 1);
*b->command = (char *)((*b) + 1);
*b->description = *b->command + strlen(command) + 1;
- strcpy(*b->command, command);
- strcpy(*b->description, description);
+ strlcpy(*b->command, command, strlen(command) + 1);
+ strlcpy(*b->description, description, strlen(description) + 1);
}
-void M_AddBind (char *category, char *command, char *description)
+static void M_AddBind (char *category, char *command, char *description)
{
for (c = &bindcategories;*c;c = &(*c)->next)
{
M_AddBindToCategory(*c, command, description);
}
-void M_DefaultBinds (void)
+static void M_DefaultBinds (void)
{
M_ClearBinds();
M_AddBind("movement", "+jump", "jump / swim up");
*/
-int keys_cursor;
-int bind_grab;
+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;
+ key_dest = key_menu_grabbed;
m_state = m_keys;
m_entersound = true;
-}
-#define NUMKEYS 5
-
-void M_FindKeysForCommand (const char *command, int *keys)
-{
- int count;
- int j;
- char *b;
-
- for (j = 0;j < NUMKEYS;j++)
- keys[j] = -1;
-
- count = 0;
+ if (gamemode == GAME_TRANSFUSION)
+ {
+ numcommands = sizeof(transfusionbindnames) / sizeof(transfusionbindnames[0]);
+ bindnames = transfusionbindnames;
+ }
+ else if (gamemode == GAME_GOODVSBAD2)
+ {
+ numcommands = sizeof(goodvsbad2bindnames) / sizeof(goodvsbad2bindnames[0]);
+ bindnames = goodvsbad2bindnames;
+ }
+ else
+ {
+ numcommands = sizeof(quakebindnames) / sizeof(quakebindnames[0]);
+ bindnames = quakebindnames;
+ }
- for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
+ // Make sure "keys_cursor" doesn't start on a section in the binding list
+ keys_cursor = 0;
+ while (bindnames[keys_cursor][0][0] == '\0')
{
- b = keybindings[0][j];
- if (!b)
- continue;
- if (!strcmp (b, command) )
- {
- keys[count++] = j;
- if (count == NUMKEYS)
- break;
- }
+ keys_cursor++;
+
+ // Only sections? There may be a problem somewhere...
+ if (keys_cursor >= numcommands)
+ Sys_Error ("M_Init: The key binding list only contains sections");
}
}
-void M_UnbindCommand (char *command)
+#define NUMKEYS 5
+
+static void M_UnbindCommand (const char *command)
{
int j;
- char *b;
+ const char *b;
for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
{
}
-void M_Keys_Draw (void)
+static void M_Keys_Draw (void)
{
int i, j;
int keys[NUMKEYS];
M_Background(320, 48 + 8 * numcommands);
- p = Draw_CachePic ("gfx/ttl_cstm", false);
- M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm");
+ p = Draw_CachePic ("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");
else
M_Print(16, y, bindnames[i][1]);
- M_FindKeysForCommand (bindnames[i][0], keys);
+ 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)
- strcpy(keystring, "???");
+ strlcpy(keystring, "???", sizeof(keystring));
else
{
+ char tinystr[2];
keystring[0] = 0;
for (j = 0;j < NUMKEYS;j++)
{
if (keys[j] != -1)
{
if (j > 0)
- strcat(keystring, " or ");
- strcat(keystring, Key_KeynumToString (keys[j]));
+ strlcat(keystring, " or ", sizeof(keystring));
+ strlcat(keystring, Key_KeynumToString (keys[j], tinystr, sizeof(tinystr)), sizeof(keystring));
}
}
}
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));
}
-void M_Keys_Key (int k, char 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
}
else //if (k != '`')
{
- sprintf (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;
switch (k)
{
case K_ESCAPE:
- M_Menu_Options_f ();
+ M_Menu_Options_f(cmd);
break;
case K_LEFTARROW:
break;
case K_ENTER: // go into bind mode
- M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
+ Key_FindKeysForCommand (bindnames[keys_cursor][0], keys, NUMKEYS, 0);
S_LocalSound ("sound/misc/menu2.wav");
if (keys[NUMKEYS - 1] != -1)
M_UnbindCommand (bindnames[keys_cursor][0]);
}
}
-void M_Menu_Reset_f (void)
+void M_Menu_Reset_f(cmd_state_t *cmd)
{
key_dest = key_menu;
m_state = m_reset;
}
-void M_Reset_Key (int key, char ascii)
+static void M_Reset_Key(cmd_state_t *cmd, int key, int ascii)
{
switch (key)
{
case 'Y':
case 'y':
- Cbuf_AddText ("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:
}
}
-void M_Reset_Draw (void)
+static void M_Reset_Draw (void)
{
int lines = 2, linelength = 20;
M_Background(linelength * 8 + 16, lines * 8 + 16);
//=============================================================================
/* VIDEO MENU */
-// note: if modes are added to the beginning of this list, update VID_DEFAULT
-typedef struct video_resolution_s
-{
- const char *type;
- int width, height;
- int conwidth, conheight;
- double pixelheight; // pixel aspect
-}
-video_resolution_t;
-video_resolution_t video_resolutions[] =
+video_resolution_t video_resolutions_hardcoded[] =
{
{"Standard 4x3" , 320, 240, 320, 240, 1 },
{"Standard 4x3" , 400, 300, 400, 300, 1 },
{"WideScreen 16x9" , 683, 384, 683, 384, 1 },
{"WideScreen 16x9" , 960, 540, 640, 360, 1 },
{"WideScreen 16x9" , 1280, 720, 640, 360, 1 },
+{"WideScreen 16x9" , 1360, 768, 680, 384, 1 },
{"WideScreen 16x9" , 1366, 768, 683, 384, 1 },
{"WideScreen 16x9" , 1920,1080, 640, 360, 1 },
{"WideScreen 16x9" , 2560,1440, 640, 360, 1 },
{NULL, 0, 0, 0, 0, 0}
};
// this is the number of the default mode (640x480) in the list above
-#define VID_DEFAULT 3
-#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
+int video_resolutions_hardcoded_count = sizeof(video_resolutions_hardcoded) / sizeof(*video_resolutions_hardcoded) - 1;
-#define VIDEO_ITEMS 7
-int video_cursor = 0;
-int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162};
-int video_resolution;
+#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};
+static int menu_video_resolution;
-void M_Menu_Video_f (void)
+video_resolution_t *video_resolutions;
+int video_resolutions_count;
+
+static video_resolution_t *menu_video_resolutions;
+static int menu_video_resolutions_count;
+static qbool menu_video_resolutions_forfullscreen;
+
+static void M_Menu_Video_FindResolution(int w, int h, float a)
{
int i;
- key_dest = key_menu;
- m_state = m_video;
- m_entersound = true;
+ if(menu_video_resolutions_forfullscreen)
+ {
+ menu_video_resolutions = video_resolutions;
+ menu_video_resolutions_count = video_resolutions_count;
+ }
+ else
+ {
+ menu_video_resolutions = video_resolutions_hardcoded;
+ menu_video_resolutions_count = video_resolutions_hardcoded_count;
+ }
// Look for the closest match to the current resolution
- video_resolution = 0;
- for (i = 1;i < VID_RES_COUNT;i++)
+ menu_video_resolution = 0;
+ for (i = 1;i < menu_video_resolutions_count;i++)
{
// if the new mode would be a worse match in width, skip it
- if (fabs(video_resolutions[i].width - vid.width) > fabs(video_resolutions[video_resolution].width - vid.width))
+ if (abs(menu_video_resolutions[i].width - w) > abs(menu_video_resolutions[menu_video_resolution].width - w))
continue;
// if it is equal in width, check height
- if (video_resolutions[i].width == vid.width && video_resolutions[video_resolution].width == vid.width)
+ if (menu_video_resolutions[i].width == w && menu_video_resolutions[menu_video_resolution].width == w)
{
// if the new mode would be a worse match in height, skip it
- if (fabs(video_resolutions[i].height - vid.height) > fabs(video_resolutions[video_resolution].height - vid.height))
+ if (abs(menu_video_resolutions[i].height - h) > abs(menu_video_resolutions[menu_video_resolution].height - h))
continue;
// if it is equal in width and height, check pixel aspect
- if (video_resolutions[i].height == vid.height && video_resolutions[video_resolution].height == vid.height)
+ if (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 (fabs(video_resolutions[i].pixelheight - vid_pixelheight.value) > fabs(video_resolutions[video_resolution].pixelheight - vid_pixelheight.value))
+ 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 (video_resolutions[i].pixelheight == vid_pixelheight.value && video_resolutions[video_resolution].pixelheight == vid_pixelheight.value)
+ if (menu_video_resolutions[i].pixelheight == a && menu_video_resolutions[menu_video_resolution].pixelheight == a)
continue;
// better match for width, height, and pixel aspect
- video_resolution = i;
+ menu_video_resolution = i;
}
else // better match for width and height
- video_resolution = i;
+ menu_video_resolution = i;
}
else // better match for width
- video_resolution = i;
+ menu_video_resolution = i;
}
}
+void M_Menu_Video_f(cmd_state_t *cmd)
+{
+ key_dest = key_menu;
+ m_state = m_video;
+ m_entersound = true;
+
+ M_Menu_Video_FindResolution(vid.width, vid.height, vid_pixelheight.value);
+}
+
-void M_Video_Draw (void)
+static void M_Video_Draw (void)
{
+ int t;
cachepic_t *p;
+ char vabuf[1024];
+
+ if(!!vid_fullscreen.integer != menu_video_resolutions_forfullscreen)
+ {
+ video_resolution_t *res = &menu_video_resolutions[menu_video_resolution];
+ menu_video_resolutions_forfullscreen = !!vid_fullscreen.integer;
+ M_Menu_Video_FindResolution(res->width, res->height, res->pixelheight);
+ }
M_Background(320, 200);
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/vidmodes", false);
- M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes");
+ p = Draw_CachePic ("gfx/vidmodes");
+ M_DrawPic((320-Draw_GetPicWidth(p))/2, 4, "gfx/vidmodes");
- // Current Resolution
- M_Print(16, video_cursor_table[0], " Current Resolution");
- if (vid_supportrefreshrate && vid.fullscreen)
- M_Print(220, video_cursor_table[0], va("%dx%d %dhz", vid.width, vid.height, vid.refreshrate));
+ 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(vabuf, sizeof(vabuf), "%dx%d %.2fhz", vid.width, vid.height, vid.refreshrate));
else
- M_Print(220, video_cursor_table[0], 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(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++;
- // Proposed Resolution
- M_Print(16, video_cursor_table[1], " New Resolution");
- M_Print(220, video_cursor_table[1], va("%dx%d", video_resolutions[video_resolution].width, video_resolutions[video_resolution].height));
- M_Print(96, video_cursor_table[1] + 8, va("Type: %s", video_resolutions[video_resolution].type));
+ // Antialiasing
+ M_Print(16, video_cursor_table[t], " Antialiasing");
+ M_DrawSlider(220, video_cursor_table[t], vid_samples.value, 1, 32);
+ t++;
- // Bits per pixel
- M_Print(16, video_cursor_table[2], " Bits per pixel");
- M_Print(220, video_cursor_table[2], (vid_bitsperpixel.integer == 32) ? "32" : "16");
+ // Refresh Rate
+ M_ItemPrint(16, video_cursor_table[t], " Use Refresh Rate", vid_supportrefreshrate);
+ M_DrawCheckbox(220, video_cursor_table[t], vid_userefreshrate.integer);
+ t++;
// Refresh Rate
- M_ItemPrint(16, video_cursor_table[3], " Refresh Rate", vid_supportrefreshrate);
- M_DrawSlider(220, video_cursor_table[3], vid_refreshrate.integer, 60, 150);
+ M_ItemPrint(16, video_cursor_table[t], " Refresh Rate", vid_supportrefreshrate && vid_userefreshrate.integer);
+ M_DrawSlider(220, video_cursor_table[t], vid_refreshrate.value, 50, 150);
+ t++;
// Fullscreen
- M_Print(16, video_cursor_table[4], " Fullscreen");
- M_DrawCheckbox(220, video_cursor_table[4], vid_fullscreen.integer);
-
- // "Apply" button
- M_Print(220, video_cursor_table[5], "Apply");
+ M_Print(16, video_cursor_table[t], " Fullscreen");
+ M_DrawCheckbox(220, video_cursor_table[t], vid_fullscreen.integer);
+ t++;
// Vertical Sync
- M_ItemPrint(16, video_cursor_table[6], " Vertical Sync", gl_videosyncavailable);
- M_DrawCheckbox(220, video_cursor_table[6], vid_vsync.integer);
+ M_ItemPrint(16, video_cursor_table[t], " Vertical Sync", true);
+ M_DrawCheckbox(220, video_cursor_table[t], vid_vsync.integer);
+ t++;
+
+ M_ItemPrint(16, video_cursor_table[t], " Anisotropic Filter", vid.support.ext_texture_filter_anisotropic);
+ M_DrawSlider(220, video_cursor_table[t], gl_texture_anisotropy.integer, 1, vid.max_anisotropy);
+ t++;
+
+ M_ItemPrint(16, video_cursor_table[t], " Texture Quality", true);
+ M_DrawSlider(220, video_cursor_table[t], gl_picmip.value, 3, 0);
+ t++;
+
+ M_ItemPrint(16, video_cursor_table[t], " Texture Compression", true);
+ M_DrawCheckbox(220, video_cursor_table[t], gl_texturecompression.integer);
+ t++;
+
+ // "Apply" button
+ M_Print(220, video_cursor_table[t], "Apply");
+ 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));
}
-void M_Menu_Video_AdjustSliders (int dir)
+static void M_Menu_Video_AdjustSliders (int dir)
{
+ int t;
+
S_LocalSound ("sound/misc/menu3.wav");
- switch (video_cursor)
+ t = 0;
+ if (video_cursor == t++)
{
// Resolution
- case 1:
+ int r;
+ for(r = 0;r < menu_video_resolutions_count;r++)
{
- int r;
- for(r = 0;r < VID_RES_COUNT;r++)
- {
- video_resolution += dir;
- if (video_resolution >= VID_RES_COUNT)
- video_resolution = 0;
- if (video_resolution < 0)
- video_resolution = VID_RES_COUNT - 1;
- if (video_resolutions[video_resolution].width >= vid_minwidth.integer && video_resolutions[video_resolution].height >= vid_minheight.integer)
- break;
- }
- break;
+ menu_video_resolution += dir;
+ if (menu_video_resolution >= menu_video_resolutions_count)
+ menu_video_resolution = 0;
+ if (menu_video_resolution < 0)
+ menu_video_resolution = menu_video_resolutions_count - 1;
+ if (menu_video_resolutions[menu_video_resolution].width >= vid_minwidth.integer && menu_video_resolutions[menu_video_resolution].height >= vid_minheight.integer)
+ break;
}
-
- // Bits per pixel
- case 2:
- Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32);
- break;
- // Refresh Rate
- case 3:
- Cvar_SetValueQuick (&vid_refreshrate, vid_refreshrate.integer + dir);
- break;
- case 4:
- Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
- break;
-
- case 6:
- Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
- break;
}
+ 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++)
+ Cvar_SetValueQuick (&vid_userefreshrate, !vid_userefreshrate.integer);
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&vid_refreshrate, bound(50, vid_refreshrate.value + dir, 150));
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value * (dir < 0 ? 0.5 : 2.0), vid.max_anisotropy));
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
+ else if (video_cursor == t++)
+ Cvar_SetValueQuick (&gl_texturecompression, !gl_texturecompression.integer);
}
-void M_Video_Key (int key, char ascii)
+static void M_Video_Key(cmd_state_t *cmd, int key, int ascii)
{
switch (key)
{
// vid_shared.c has a copy of the current video config. We restore it
Cvar_SetValueQuick(&vid_fullscreen, vid.fullscreen);
Cvar_SetValueQuick(&vid_bitsperpixel, vid.bitsperpixel);
+ Cvar_SetValueQuick(&vid_samples, vid.samples);
if (vid_supportrefreshrate)
Cvar_SetValueQuick(&vid_refreshrate, vid.refreshrate);
+ 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:
m_entersound = true;
switch (video_cursor)
{
- case 5:
- Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution].width);
- Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution].height);
- Cvar_SetValueQuick (&vid_conwidth, video_resolutions[video_resolution].conwidth);
- Cvar_SetValueQuick (&vid_conheight, video_resolutions[video_resolution].conheight);
- Cvar_SetValueQuick (&vid_pixelheight, video_resolutions[video_resolution].pixelheight);
- Cbuf_AddText ("vid_restart\n");
- M_Menu_Options_f ();
+ case (VIDEO_ITEMS - 1):
+ Cvar_SetValueQuick (&vid_width, menu_video_resolutions[menu_video_resolution].width);
+ Cvar_SetValueQuick (&vid_height, menu_video_resolutions[menu_video_resolution].height);
+ 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(cmd, "vid_restart\n");
+ M_Menu_Options_f(cmd);
break;
default:
M_Menu_Video_AdjustSliders (1);
//=============================================================================
/* HELP MENU */
-int help_page;
+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;
-void M_Help_Draw (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));
}
-void M_Help_Key (int key, char 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:
//=============================================================================
/* 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;
-void M_Credits_Draw (void)
+static void M_Credits_Draw (void)
{
M_Background(640, 480);
M_DrawPic (0, 0, "gfx/creditsmiddle");
}
-void M_Credits_Key (int key, char ascii)
+static void M_Credits_Key(cmd_state_t *cmd, int key, int ascii)
{
- M_Menu_Main_f ();
+ M_Menu_Main_f(cmd);
}
//=============================================================================
/* QUIT MENU */
-char *m_quit_message[9];
-int m_quit_prevstate;
-qboolean wasInMenus;
+static const char *m_quit_message[9];
+static int m_quit_prevstate;
+static qbool wasInMenus;
-int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8)
+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)
{
m_quit_message[0] = line1;
m_quit_message[1] = line2;
return 1;
}
-int M_ChooseQuitMessage(int request)
+static int M_ChooseQuitMessage(int request)
{
+ if (m_missingdata)
+ {
+ // frag related quit messages are pointless for a fallback menu, so use something generic
+ if (request-- == 0) return M_QuitMessage("Are you sure you want to quit?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
+ return 0;
+ }
switch (gamemode)
{
case GAME_NORMAL:
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);
if (request-- == 0) return M_QuitMessage("You prefer free beer over free speech?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
if (request-- == 0) return M_QuitMessage("Is OpenQuartz Propaganda?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
break;
- case GAME_NEXUIZ: //frag related quit messages are pointless for a fallback menu!
- if (request-- == 0) return M_QuitMessage("Are you sure you want to quit?","Press Y to quit, N to stay",NULL,NULL,NULL,NULL,NULL,NULL);
- break;
default:
if (request-- == 0) return M_QuitMessage("Tired of fragging already?",NULL,NULL,NULL,NULL,NULL,NULL,NULL);
if (request-- == 0) return M_QuitMessage("Quit now and forfeit your bodycount?",NULL,NULL,NULL,NULL,NULL,NULL,NULL);
break;
}
return 0;
-};
+}
-void M_Menu_Quit_f (void)
+void M_Menu_Quit_f(cmd_state_t *cmd)
{
int n;
if (m_state == m_quit)
return;
- wasInMenus = (key_dest == key_menu);
+ wasInMenus = (key_dest == key_menu || key_dest == key_menu_grabbed);
key_dest = key_menu;
m_quit_prevstate = m_state;
m_state = m_quit;
m_entersound = true;
// count how many there are
- for (n = 0;M_ChooseQuitMessage(n);n++);
+ for (n = 1;M_ChooseQuitMessage(n);n++);
// choose one
M_ChooseQuitMessage(rand() % n);
}
-void M_Quit_Key (int key, char ascii)
+static void M_Quit_Key(cmd_state_t *cmd, int key, int ascii)
{
switch (key)
{
case 'Y':
case 'y':
- Host_Quit_f ();
+ host.state = host_shutdown;
break;
default:
}
}
-void M_Quit_Draw (void)
+static void M_Quit_Draw (void)
{
int i, l, linelength, firstline, lastline, lines;
for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_quit_message[i];i++)
}
lines = (lastline - firstline) + 1;
M_Background(linelength * 8 + 16, lines * 8 + 16);
- if (gamemode != GAME_NEXUIZ) //since this is a fallback menu for Nexuiz (no graphics), it is very hard to read with the box
- M_DrawTextBox(0, 0, linelength, lines); //this is less obtrusive than hacking up the M_DrawTextBox function for Nexuiz
+ if (!m_missingdata) //since this is a fallback menu for missing data, it is very hard to read with the box
+ M_DrawTextBox(0, 0, linelength, lines); //this is less obtrusive than hacking up the M_DrawTextBox function
for (i = 0, l = firstline;i < lines;i++, l++)
M_Print(8 + 4 * (linelength - strlen(m_quit_message[l])), 8 + 8 * i, m_quit_message[l]);
}
//=============================================================================
/* LAN CONFIG MENU */
-int lanConfig_cursor = -1;
-int lanConfig_cursor_table [] = {56, 76, 84, 120};
+static int lanConfig_cursor = -1;
+static int lanConfig_cursor_table [] = {56, 76, 84, 120};
#define NUM_LANCONFIG_CMDS 4
-int lanConfig_port;
-char lanConfig_portname[6];
-char lanConfig_joinname[22];
+static int lanConfig_port;
+static char lanConfig_portname[6];
+static char lanConfig_joinname[40];
-void M_Menu_LanConfig_f (void)
+void M_Menu_LanConfig_f(cmd_state_t *cmd)
{
key_dest = key_menu;
m_state = m_lanconfig;
if (StartingGame)
lanConfig_cursor = 1;
lanConfig_port = 26000;
- sprintf(lanConfig_portname, "%u", lanConfig_port);
+ dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port);
M_Update_Return_Reason("");
}
-void M_LanConfig_Draw (void)
+static void M_LanConfig_Draw (void)
{
cachepic_t *p;
int basex;
- char *startJoin;
- char *protocol;
+ 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", false);
- basex = (320-p->width)/2;
+ p = Draw_CachePic ("gfx/p_multi");
+ basex = (320-Draw_GetPicWidth(p))/2;
M_DrawPic (basex, 4, "gfx/p_multi");
if (StartingGame)
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");
- M_DrawTextBox (basex+8*8, lanConfig_cursor_table[0]-8, 6, 1);
+ M_DrawTextBox (basex+8*8, lanConfig_cursor_table[0]-8, sizeof(lanConfig_portname), 1);
M_Print(basex+9*8, lanConfig_cursor_table[0], lanConfig_portname);
if (JoiningGame)
M_Print(basex, lanConfig_cursor_table[1], "Search for DarkPlaces games...");
M_Print(basex, lanConfig_cursor_table[2], "Search for QuakeWorld games...");
M_Print(basex, lanConfig_cursor_table[3]-16, "Join game at:");
- M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, 22, 1);
+ M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, sizeof(lanConfig_joinname), 1);
M_Print(basex+16, lanConfig_cursor_table[3], lanConfig_joinname);
}
else
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);
}
-void M_LanConfig_Key (int key, char 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:
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:
if (lanConfig_cursor == 3)
{
l = (int)strlen(lanConfig_joinname);
- if (l < 21)
+ if (l < (int)sizeof(lanConfig_joinname) - 1)
{
lanConfig_joinname[l+1] = 0;
lanConfig_joinname[l] = ascii;
if (lanConfig_cursor == 0)
{
l = (int)strlen(lanConfig_portname);
- if (l < 5)
+ if (l < (int)sizeof(lanConfig_portname) - 1)
{
lanConfig_portname[l+1] = 0;
lanConfig_portname[l] = ascii;
l = atoi(lanConfig_portname);
if (l <= 65535)
lanConfig_port = l;
- sprintf(lanConfig_portname, "%u", lanConfig_port);
+ dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port);
}
//=============================================================================
typedef struct level_s
{
- char *name;
- char *description;
+ const char *name;
+ const char *description;
} level_t;
typedef struct episode_s
{
- char *description;
+ const char *description;
int firstLevel;
int levels;
} episode_t;
typedef struct gamelevels_s
{
- char *gamename;
+ const char *gamename;
level_t *levels;
episode_t *episodes;
int numepisodes;
}
gamelevels_t;
-level_t quakelevels[] =
+static level_t quakelevels[] =
{
{"start", "Entrance"}, // 0
{"dm6", "The Dark Zone"}
};
-episode_t quakeepisodes[] =
+static episode_t quakeepisodes[] =
{
{"Welcome to Quake", 0, 1},
{"Doomed Dimension", 1, 8},
};
//MED 01/06/97 added hipnotic levels
-level_t hipnoticlevels[] =
+static level_t hipnoticlevels[] =
{
{"start", "Command HQ"}, // 0
};
//MED 01/06/97 added hipnotic episodes
-episode_t hipnoticepisodes[] =
+static episode_t hipnoticepisodes[] =
{
{"Scourge of Armagon", 0, 1},
{"Fortress of the Dead", 1, 5},
//PGM 01/07/97 added rogue levels
//PGM 03/02/97 added dmatch level
-level_t roguelevels[] =
+static level_t roguelevels[] =
{
{"start", "Split Decision"},
{"r1m1", "Deviant's Domain"},
//PGM 01/07/97 added rogue episodes
//PGM 03/02/97 added dmatch episode
-episode_t rogueepisodes[] =
+static episode_t rogueepisodes[] =
{
{"Introduction", 0, 1},
{"Hell's Fortress", 1, 7},
{"Deathmatch Arena", 16, 1}
};
-level_t nehahralevels[] =
+static level_t nehahralevels[] =
{
{"nehstart", "Welcome to Nehahra"},
{"neh1m1", "Forge City1: Slipgates"},
{"nehend", "Quintessence"}
};
-episode_t nehahraepisodes[] =
+static episode_t nehahraepisodes[] =
{
{"Welcome to Nehahra", 0, 1},
{"The Fall of Forge", 1, 9},
};
// Map list for Transfusion
-level_t transfusionlevels[] =
+static level_t transfusionlevels[] =
{
{"e1m1", "Cradle to Grave"},
{"e1m2", "Wrong Side of the Tracks"},
{"simple", "Dead Simple"}
};
-episode_t transfusionepisodes[] =
+static episode_t transfusionepisodes[] =
{
{"The Way of All Flesh", 0, 8},
{"Even Death May Die", 8, 9},
{"Conversions", 85, 9}
};
-level_t goodvsbad2levels[] =
+static level_t goodvsbad2levels[] =
{
{"rts", "Many Paths"}, // 0
{"chess", "Chess, Scott Hess"}, // 1
{"island", "Adventure Islands"},
};
-episode_t goodvsbad2episodes[] =
+static episode_t goodvsbad2episodes[] =
{
{"Levels? Bevels!", 0, 8},
};
-level_t battlemechlevels[] =
+static level_t battlemechlevels[] =
{
{"start", "Parking Level"},
{"dm1", "Hot Dump"}, // 1
{"dm6", "Army go Underground"},
};
-episode_t battlemechepisodes[] =
+static episode_t battlemechepisodes[] =
{
{"Time for Battle", 0, 7},
};
-level_t openquartzlevels[] =
+static level_t openquartzlevels[] =
{
{"start", "Welcome to Openquartz"},
{"am1", "The nameless chambers"},
};
-episode_t openquartzepisodes[] =
+static episode_t openquartzepisodes[] =
{
{"Single Player", 0, 1},
{"Void Deathmatch", 1, 6},
{"Contrib", 7, 6},
};
-level_t defeatindetail2levels[] =
+static level_t defeatindetail2levels[] =
{
{"atac3", "River Crossing"},
{"atac4", "Canyon Chaos"},
{"atac7", "Desert Stormer"},
};
-episode_t defeatindetail2episodes[] =
+static episode_t defeatindetail2episodes[] =
{
{"ATAC Campaign", 0, 3},
};
-gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
-gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
-gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
-gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
-gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
-gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 11};
-gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
-gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
-gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
-gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1};
+static level_t prydonlevels[] =
+{
+ {"curig2", "Capel Curig"}, // 0
+
+ {"tdastart", "Gateway"}, // 1
+};
+
+static episode_t prydonepisodes[] =
+{
+ {"Prydon Gate", 0, 1},
+ {"The Dark Age", 1, 1}
+};
+
+static gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
+static gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
+static gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
+static gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
+static gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
+static gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 11};
+static gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
+static gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
+static gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
+static gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1};
+static gamelevels_t prydongame = {"Prydon Gate", prydonlevels, prydonepisodes, 2};
typedef struct gameinfo_s
{
}
gameinfo_t;
-gameinfo_t gamelist[] =
+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},
{GAME_BATTLEMECH, &battlemechgame, &battlemechgame},
{GAME_OPENQUARTZ, &openquartzgame, &openquartzgame},
{GAME_DEFEATINDETAIL2, &defeatindetail2game, &defeatindetail2game},
- {(gamemode_t)-1, &sharewarequakegame, ®isteredquakegame} // final fallback
+ {GAME_PRYDON, &prydongame, &prydongame},
};
-gamelevels_t *lookupgameinfo(void)
-{
- int i;
- for (i = 0;gamelist[i].gameid >= 0 && gamelist[i].gameid != gamemode;i++);
- if (registered.integer)
- return gamelist[i].registered;
- else
- return gamelist[i].notregistered;
-}
+static gamelevels_t *gameoptions_levels = NULL;
-int startepisode;
-int startlevel;
-int maxplayers;
-qboolean m_serverInfoMessage = false;
-double m_serverInfoMessageTime;
+static int startepisode;
+static int startlevel;
+static int maxplayers;
+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;
m_state = m_gameoptions;
m_entersound = true;
maxplayers = svs.maxclients;
if (maxplayers < 2)
maxplayers = min(8, MAX_SCOREBOARD);
+ // pick game level list based on gamemode (use GAME_NORMAL if no matches)
+ gameoptions_levels = registered.integer ? gamelist[0].registered : gamelist[0].notregistered;
+ for (i = 0;i < (int)(sizeof(gamelist)/sizeof(gamelist[0]));i++)
+ if (gamelist[i].gameid == gamemode)
+ gameoptions_levels = registered.integer ? gamelist[i].registered : gamelist[i].notregistered;
}
-int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168};
+static int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168};
#define NUM_GAMEOPTIONS 12
-int gameoptions_cursor;
+static int gameoptions_cursor;
void M_GameOptions_Draw (void)
{
cachepic_t *p;
int x;
- gamelevels_t *g;
+ char vabuf[1024];
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/p_multi", false);
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
+ p = Draw_CachePic ("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)
{
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)
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
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
M_Print(0, 72, " Teamplay");
if (gamemode == GAME_ROGUE)
{
- char *msg;
+ const char *msg;
switch((int)teamplay.integer)
{
}
else
{
- char *msg;
+ const char *msg;
switch (teamplay.integer)
{
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);
M_Print(8, 140, hostname.string);
- g = lookupgameinfo();
-
if (gamemode != GAME_GOODVSBAD2)
{
M_Print(0, 160, " Episode");
- M_Print(160, 160, g->episodes[startepisode].description);
+ M_Print(160, 160, gameoptions_levels->episodes[startepisode].description);
}
M_Print(0, 168, " Level");
- M_Print(160, 168, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
- M_Print(160, 176, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
+ M_Print(160, 168, gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].description);
+ M_Print(160, 176, gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].name);
// 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);
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;
}
-void M_NetStart_Change (int dir)
+static void M_NetStart_Change (int dir)
{
- gamelevels_t *g;
int count;
switch (gameoptions_cursor)
{
maxplayers = MAX_SCOREBOARD;
m_serverInfoMessage = true;
- m_serverInfoMessageTime = realtime;
+ m_serverInfoMessageTime = host.realtime;
}
if (maxplayers < 2)
maxplayers = 2;
case 8:
Cvar_SetValueQuick (&sv_maxrate, sv_maxrate.integer + dir*500);
- if (sv_maxrate.integer > NET_MAXRATE)
- Cvar_SetValueQuick (&sv_maxrate, NET_MAXRATE);
if (sv_maxrate.integer < NET_MINRATE)
Cvar_SetValueQuick (&sv_maxrate, NET_MINRATE);
break;
if (gamemode == GAME_GOODVSBAD2)
break;
startepisode += dir;
- g = lookupgameinfo();
if (startepisode < 0)
- startepisode = g->numepisodes - 1;
+ startepisode = gameoptions_levels->numepisodes - 1;
- if (startepisode >= g->numepisodes)
+ if (startepisode >= gameoptions_levels->numepisodes)
startepisode = 0;
startlevel = 0;
case 11:
startlevel += dir;
- g = lookupgameinfo();
if (startlevel < 0)
- startlevel = g->episodes[startepisode].levels - 1;
+ startlevel = gameoptions_levels->episodes[startepisode].levels - 1;
- if (startlevel >= g->episodes[startepisode].levels)
+ if (startlevel >= gameoptions_levels->episodes[startepisode].levels)
startlevel = 0;
break;
}
}
-void M_GameOptions_Key (int key, char ascii)
+static void M_GameOptions_Key(cmd_state_t *cmd, int key, int ascii)
{
- gamelevels_t *g;
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:
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) );
- g = lookupgameinfo();
- Cbuf_AddText ( va ("map %s\n", g->levels[g->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;
}
l = min(l - 1, 37);
memcpy(hostnamebuf, hostname.string, l);
hostnamebuf[l] = 0;
- Cvar_Set("hostname", hostnamebuf);
+ Cvar_Set(&cvars_all, "hostname", hostnamebuf);
}
}
break;
memcpy(hostnamebuf, hostname.string, l);
hostnamebuf[l] = ascii;
hostnamebuf[l+1] = 0;
- Cvar_Set("hostname", hostnamebuf);
+ Cvar_Set(&cvars_all, "hostname", hostnamebuf);
}
}
}
//=============================================================================
/* SLIST MENU */
-int slist_cursor;
+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;
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);
}
-void M_ServerList_Draw (void)
+static void M_ServerList_Draw (void)
{
- int n, y, visible, start, end;
+ 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)
else
M_Background(640, vid_conheight.integer);
// scroll the list as the cursor moves
- s = va("%i/%i masters %i/%i servers", masterreplycount, masterquerycount, serverreplycount, serverquerycount);
+ 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);
y = 48;
- visible = (menu_height - 16 - y) / 8 / 2;
+ visible = (int)((menu_height - 16 - y) / 8 / 2);
start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible);
end = min(start + visible, serverlist_viewcount);
- p = Draw_CachePic("gfx/p_multi", false);
- M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi");
+ p = Draw_CachePic ("gfx/p_multi");
+ M_DrawPic((640 - Draw_GetPicWidth(p)) / 2, 4, "gfx/p_multi");
if (end > start)
{
for (n = start;n < end;n++)
{
- DrawQ_Pic(menu_x, menu_y + y, NULL, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
- M_PrintColored(0, y, serverlist_viewlist[n]->line1);y += 8;
- M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8;
+ serverlist_entry_t *entry = ServerList_GetViewEntry(n);
+ 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");
}
-void M_ServerList_Key(int k, char 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:
case K_ENTER:
S_LocalSound ("sound/misc/menu2.wav");
if (serverlist_viewcount)
- Cbuf_AddText(va("connect \"%s\"\n", serverlist_viewlist[slist_cursor]->info.cname));
+ Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "connect \"%s\"\n", ServerList_GetViewEntry(slist_cursor)->info.cname));
break;
default:
}
//=============================================================================
-/* Menu Subsystem */
-
-void M_Keydown(int key, char ascii);
-void M_Draw(void);
-void M_ToggleMenu_f(void);
-void M_Shutdown(void);
+/* MODLIST MENU */
+// same limit of mod dirs as in fs.c
+#define MODLIST_MAXDIRS 16
+static int modlist_enabled [MODLIST_MAXDIRS]; //array of indexs to modlist
+static int modlist_numenabled; //number of enabled (or in process to be..) mods
-void M_Init (void)
+typedef struct modlist_entry_s
{
- menuplyr_load = true;
- menuplyr_pixels = NULL;
+ qbool loaded; // used to determine whether this entry is loaded and running
+ int enabled; // index to array of modlist_enabled
- Cmd_AddCommand ("menu_main", M_Menu_Main_f, "open the main menu");
- Cmd_AddCommand ("menu_singleplayer", M_Menu_SinglePlayer_f, "open the singleplayer menu");
- Cmd_AddCommand ("menu_load", M_Menu_Load_f, "open the loadgame menu");
- Cmd_AddCommand ("menu_save", M_Menu_Save_f, "open the savegame menu");
- Cmd_AddCommand ("menu_multiplayer", M_Menu_MultiPlayer_f, "open the multiplayer menu");
- Cmd_AddCommand ("menu_setup", M_Menu_Setup_f, "open the player setup menu");
- Cmd_AddCommand ("menu_options", M_Menu_Options_f, "open the options menu");
- Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f, "open the effects options menu");
- Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f, "open the graphics options menu");
- Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f, "open the color control menu");
- Cmd_AddCommand ("menu_keys", M_Menu_Keys_f, "open the key binding menu");
- Cmd_AddCommand ("menu_video", M_Menu_Video_f, "open the video options menu");
- Cmd_AddCommand ("menu_reset", M_Menu_Reset_f, "open the reset to defaults menu");
- Cmd_AddCommand ("help", M_Menu_Help_f, "open the help menu");
- Cmd_AddCommand ("menu_quit", M_Menu_Quit_f, "open the quit menu");
- Cmd_AddCommand ("menu_transfusion_episode", M_Menu_Transfusion_Episode_f, "open the transfusion episode select menu");
- Cmd_AddCommand ("menu_transfusion_skill", M_Menu_Transfusion_Skill_f, "open the transfusion skill select menu");
- Cmd_AddCommand ("menu_credits", M_Menu_Credits_f, "open the credits menu");
+ // name of the modification, this is (will...be) displayed on the menu entry
+ char name[128];
+ // directory where we will find it
+ char dir[MAX_QPATH];
+} modlist_entry_t;
- if (gamemode == GAME_TRANSFUSION)
+static int modlist_cursor;
+//static int modlist_viewcount;
+
+static int modlist_count = 0;
+static modlist_entry_t modlist[MODLIST_TOTALSIZE];
+
+static void ModList_RebuildList(void)
+{
+ int i,j;
+ stringlist_t list;
+ const char *description;
+
+ stringlistinit(&list);
+ listdirectory(&list, fs_basedir, "");
+ stringlistsort(&list, true);
+ modlist_count = 0;
+ modlist_numenabled = fs_numgamedirs;
+ for (i = 0;i < list.numstrings && modlist_count < MODLIST_TOTALSIZE;i++)
{
- numcommands = sizeof(transfusionbindnames) / sizeof(transfusionbindnames[0]);
- bindnames = transfusionbindnames;
+ // 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;
+
+ // 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
+ modlist[modlist_count].loaded = false;
+ if (fs_numgamedirs)
+ for (j = 0; j < fs_numgamedirs; j++)
+ if (!strcasecmp(fs_gamedirs[j], modlist[modlist_count].dir))
+ {
+ modlist[modlist_count].loaded = true;
+ modlist[modlist_count].enabled = j;
+ modlist_enabled[j] = modlist_count;
+ break;
+ }
+ modlist_count ++;
}
- else if (gamemode == GAME_GOODVSBAD2)
+ stringlistfreecontents(&list);
+}
+
+static void ModList_Enable (void)
+{
+ int i;
+ int numgamedirs;
+ char gamedirs[MODLIST_MAXDIRS][MAX_QPATH];
+
+ // copy our mod list into an array for FS_ChangeGameDirs
+ numgamedirs = modlist_numenabled;
+ for (i = 0; i < modlist_numenabled; i++)
+ strlcpy (gamedirs[i], modlist[modlist_enabled[i]].dir,sizeof (gamedirs[i]));
+
+ // this code snippet is from FS_ChangeGameDirs
+ if (fs_numgamedirs == numgamedirs)
{
- numcommands = sizeof(goodvsbad2bindnames) / sizeof(goodvsbad2bindnames[0]);
- bindnames = goodvsbad2bindnames;
+ for (i = 0;i < numgamedirs;i++)
+ if (strcasecmp(fs_gamedirs[i], gamedirs[i]))
+ break;
+ if (i == numgamedirs)
+ return; // already using this set of gamedirs, do nothing
}
- else
+
+ // this part is basically the same as the FS_GameDir_f function
+ if ((cls.state == ca_connected && !cls.demoplayback) || sv.active)
{
- numcommands = sizeof(quakebindnames) / sizeof(quakebindnames[0]);
- bindnames = quakebindnames;
+ // actually, changing during game would work fine, but would be stupid
+ Con_Printf("Can not change gamedir while client is connected or server is running!\n");
+ return;
}
- // Make sure "keys_cursor" doesn't start on a section in the binding list
- keys_cursor = 0;
- while (bindnames[keys_cursor][0][0] == '\0')
- {
- keys_cursor++;
+ FS_ChangeGameDirs (modlist_numenabled, gamedirs, true, true);
+}
- // Only sections? There may be a problem somewhere...
- if (keys_cursor >= numcommands)
- Sys_Error ("M_Init: The key binding list only contains sections");
- }
+void M_Menu_ModList_f(cmd_state_t *cmd)
+{
+ key_dest = key_menu;
+ m_state = m_modlist;
+ m_entersound = true;
+ modlist_cursor = 0;
+ M_Update_Return_Reason("");
+ ModList_RebuildList();
+}
+static void M_Menu_ModList_AdjustSliders (int dir)
+{
+ int i;
+ S_LocalSound ("sound/misc/menu3.wav");
- if (gamemode == GAME_NEHAHRA)
+ // stop adding mods, we reach the limit
+ if (!modlist[modlist_cursor].loaded && (modlist_numenabled == MODLIST_MAXDIRS)) return;
+ modlist[modlist_cursor].loaded = !modlist[modlist_cursor].loaded;
+ if (modlist[modlist_cursor].loaded)
{
- if (FS_FileExists("maps/neh1m4.bsp"))
+ modlist[modlist_cursor].enabled = modlist_numenabled;
+ //push the value on the enabled list
+ modlist_enabled[modlist_numenabled++] = modlist_cursor;
+ }
+ else
+ {
+ //eliminate the value from the enabled list
+ for (i = modlist[modlist_cursor].enabled; i < modlist_numenabled; i++)
{
- if (FS_FileExists("hearing.dem"))
- {
- Con_Print("Nehahra movie and game detected.\n");
- NehGameType = TYPE_BOTH;
- }
- else
- {
- Con_Print("Nehahra game detected.\n");
- NehGameType = TYPE_GAME;
- }
+ modlist_enabled[i] = modlist_enabled[i+1];
+ modlist[modlist_enabled[i]].enabled--;
}
- else
+ modlist_numenabled--;
+ }
+}
+
+static void M_ModList_Draw (void)
+{
+ int n, y, visible, start, end;
+ cachepic_t *p;
+ const char *s_available = "Available Mods";
+ const char *s_enabled = "Enabled Mods";
+
+ // use as much vertical space as available
+ if (gamemode == GAME_TRANSFUSION)
+ M_Background(640, vid_conheight.integer - 80);
+ else
+ M_Background(640, vid_conheight.integer);
+
+ M_PrintRed(48 + 32, 32, s_available);
+ M_PrintRed(432, 32, s_enabled);
+ // Draw a list box with all enabled mods
+ DrawQ_Pic(menu_x + 432, menu_y + 48, NULL, 172, 8 * modlist_numenabled, 0, 0, 0, 0.5, 0);
+ for (y = 0; y < modlist_numenabled; y++)
+ M_PrintRed(432, 48 + y * 8, modlist[modlist_enabled[y]].dir);
+
+ if (*m_return_reason)
+ M_Print(16, menu_height - 8, m_return_reason);
+ // scroll the list as the cursor moves
+ y = 48;
+ visible = (int)((menu_height - 16 - y) / 8 / 2);
+ start = bound(0, modlist_cursor - (visible >> 1), modlist_count - visible);
+ end = min(start + visible, modlist_count);
+
+ p = Draw_CachePic ("gfx/p_option");
+ M_DrawPic((640 - Draw_GetPicWidth(p)) / 2, 4, "gfx/p_option");
+ if (end > start)
+ {
+ for (n = start;n < end;n++)
{
- if (FS_FileExists("hearing.dem"))
- {
- Con_Print("Nehahra movie detected.\n");
- NehGameType = TYPE_DEMO;
- }
- else
- {
- Con_Print("Nehahra not found.\n");
- NehGameType = TYPE_GAME; // could just complain, but...
- }
+ 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;
}
}
+ else
+ {
+ M_Print(80, y, "No Mods found");
+ }
+}
+
+static void M_ModList_Key(cmd_state_t *cmd, int k, int ascii)
+{
+ switch (k)
+ {
+ case K_ESCAPE:
+ ModList_Enable ();
+ M_Menu_Options_f(cmd);
+ break;
+
+ case K_SPACE:
+ S_LocalSound ("sound/misc/menu2.wav");
+ ModList_RebuildList();
+ break;
+
+ case K_UPARROW:
+ S_LocalSound ("sound/misc/menu1.wav");
+ modlist_cursor--;
+ if (modlist_cursor < 0)
+ modlist_cursor = modlist_count - 1;
+ break;
+
+ case K_LEFTARROW:
+ M_Menu_ModList_AdjustSliders (-1);
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("sound/misc/menu1.wav");
+ modlist_cursor++;
+ if (modlist_cursor >= modlist_count)
+ modlist_cursor = 0;
+ break;
+
+ case K_RIGHTARROW:
+ M_Menu_ModList_AdjustSliders (1);
+ break;
+
+ case K_ENTER:
+ S_LocalSound ("sound/misc/menu2.wav");
+ ModList_Enable ();
+ break;
+
+ default:
+ break;
+ }
+
+}
+
+//=============================================================================
+/* Menu Subsystem */
+
+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);
+
+static void M_Init (void)
+{
+ menuplyr_load = true;
+ menuplyr_pixels = NULL;
+
+ 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)
{
- if (key_dest != key_menu)
+ char vabuf[1024];
+ if (key_dest != key_menu && key_dest != key_menu_grabbed)
m_state = m_none;
if (m_state == m_none)
case m_slist:
M_ServerList_Draw ();
break;
+
+ case m_modlist:
+ M_ModList_Draw ();
+ break;
}
- if (gamemode == GAME_TRANSFUSION) {
+ if (gamemode == GAME_TRANSFUSION && !m_missingdata) {
if (m_state != m_credits) {
cachepic_t *p, *drop1, *drop2, *drop3;
int g, scale_x, scale_y, scale_y_repeat, top_offset;
float scale_y_rate;
scale_y_repeat = vid_conheight.integer * 2;
- g = (int)(realtime * 64)%96;
+ 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), false);
- drop1 = Draw_CachePic("gfx/menu/blooddrop1", false);
- drop2 = Draw_CachePic("gfx/menu/blooddrop2", false);
- drop3 = Draw_CachePic("gfx/menu/blooddrop3", false);
- for (scale_x = 0; scale_x <= vid_conwidth.integer; scale_x += p->width) {
+ 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 += 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);
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), false), 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);
}
}
}
}
-void M_Keydown (int key, char ascii)
+void M_KeyEvent (int key, int ascii, qbool downevent)
{
+ cmd_state_t *cmd = cmd_local;
+ if (!downevent)
+ return;
switch (m_state)
{
case m_none:
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(cmd, key, ascii);
return;
}
+
}
-void M_Shutdown(void)
+static void M_NewMap(void)
{
- // reset key_dest
- key_dest = key_game;
}
-void M_Restart(void)
+static int M_GetServerListEntryCategory(const serverlist_entry_t *entry)
{
+ return 0;
+}
+
+void M_Shutdown(void)
+{
+ // reset key_dest
+ key_dest = key_game;
}
//============================================================================
// Menu prog handling
-mfunction_t *PRVM_ED_FindFunction(const char *);
-
-#define M_F_INIT "m_init"
-#define M_F_KEYDOWN "m_keydown"
-#define M_F_DRAW "m_draw"
-// normal menu names (rest)
-#define M_F_TOGGLE "m_toggle"
-#define M_F_SHUTDOWN "m_shutdown"
-
-static char *m_required_func[] = {
-M_F_INIT,
-M_F_KEYDOWN,
-M_F_DRAW,
-M_F_TOGGLE,
-M_F_SHUTDOWN,
-};
-#ifdef NG_MENU
-qboolean m_displayed;
-#endif
+static const char *m_required_func[] = {
+"m_init",
+"m_keydown",
+"m_draw",
+"m_toggle",
+"m_shutdown",
+};
static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*);
-static func_t m_draw, m_keydown;
+static prvm_required_field_t m_required_fields[] =
+{
+#define PRVM_DECLARE_serverglobalfloat(x)
+#define PRVM_DECLARE_serverglobalvector(x)
+#define PRVM_DECLARE_serverglobalstring(x)
+#define PRVM_DECLARE_serverglobaledict(x)
+#define PRVM_DECLARE_serverglobalfunction(x)
+#define PRVM_DECLARE_clientglobalfloat(x)
+#define PRVM_DECLARE_clientglobalvector(x)
+#define PRVM_DECLARE_clientglobalstring(x)
+#define PRVM_DECLARE_clientglobaledict(x)
+#define PRVM_DECLARE_clientglobalfunction(x)
+#define PRVM_DECLARE_menuglobalfloat(x)
+#define PRVM_DECLARE_menuglobalvector(x)
+#define PRVM_DECLARE_menuglobalstring(x)
+#define PRVM_DECLARE_menuglobaledict(x)
+#define PRVM_DECLARE_menuglobalfunction(x)
+#define PRVM_DECLARE_serverfieldfloat(x)
+#define PRVM_DECLARE_serverfieldvector(x)
+#define PRVM_DECLARE_serverfieldstring(x)
+#define PRVM_DECLARE_serverfieldedict(x)
+#define PRVM_DECLARE_serverfieldfunction(x)
+#define PRVM_DECLARE_clientfieldfloat(x)
+#define PRVM_DECLARE_clientfieldvector(x)
+#define PRVM_DECLARE_clientfieldstring(x)
+#define PRVM_DECLARE_clientfieldedict(x)
+#define PRVM_DECLARE_clientfieldfunction(x)
+#define PRVM_DECLARE_menufieldfloat(x) {ev_float, #x},
+#define PRVM_DECLARE_menufieldvector(x) {ev_vector, #x},
+#define PRVM_DECLARE_menufieldstring(x) {ev_string, #x},
+#define PRVM_DECLARE_menufieldedict(x) {ev_entity, #x},
+#define PRVM_DECLARE_menufieldfunction(x) {ev_function, #x},
+#define PRVM_DECLARE_serverfunction(x)
+#define PRVM_DECLARE_clientfunction(x)
+#define PRVM_DECLARE_menufunction(x)
+#define PRVM_DECLARE_field(x)
+#define PRVM_DECLARE_global(x)
+#define PRVM_DECLARE_function(x)
+#include "prvm_offsets.h"
+#undef PRVM_DECLARE_serverglobalfloat
+#undef PRVM_DECLARE_serverglobalvector
+#undef PRVM_DECLARE_serverglobalstring
+#undef PRVM_DECLARE_serverglobaledict
+#undef PRVM_DECLARE_serverglobalfunction
+#undef PRVM_DECLARE_clientglobalfloat
+#undef PRVM_DECLARE_clientglobalvector
+#undef PRVM_DECLARE_clientglobalstring
+#undef PRVM_DECLARE_clientglobaledict
+#undef PRVM_DECLARE_clientglobalfunction
+#undef PRVM_DECLARE_menuglobalfloat
+#undef PRVM_DECLARE_menuglobalvector
+#undef PRVM_DECLARE_menuglobalstring
+#undef PRVM_DECLARE_menuglobaledict
+#undef PRVM_DECLARE_menuglobalfunction
+#undef PRVM_DECLARE_serverfieldfloat
+#undef PRVM_DECLARE_serverfieldvector
+#undef PRVM_DECLARE_serverfieldstring
+#undef PRVM_DECLARE_serverfieldedict
+#undef PRVM_DECLARE_serverfieldfunction
+#undef PRVM_DECLARE_clientfieldfloat
+#undef PRVM_DECLARE_clientfieldvector
+#undef PRVM_DECLARE_clientfieldstring
+#undef PRVM_DECLARE_clientfieldedict
+#undef PRVM_DECLARE_clientfieldfunction
+#undef PRVM_DECLARE_menufieldfloat
+#undef PRVM_DECLARE_menufieldvector
+#undef PRVM_DECLARE_menufieldstring
+#undef PRVM_DECLARE_menufieldedict
+#undef PRVM_DECLARE_menufieldfunction
+#undef PRVM_DECLARE_serverfunction
+#undef PRVM_DECLARE_clientfunction
+#undef PRVM_DECLARE_menufunction
+#undef PRVM_DECLARE_field
+#undef PRVM_DECLARE_global
+#undef PRVM_DECLARE_function
+};
+
+static int m_numrequiredfields = sizeof(m_required_fields) / sizeof(m_required_fields[0]);
+
+static prvm_required_field_t m_required_globals[] =
+{
+#define PRVM_DECLARE_serverglobalfloat(x)
+#define PRVM_DECLARE_serverglobalvector(x)
+#define PRVM_DECLARE_serverglobalstring(x)
+#define PRVM_DECLARE_serverglobaledict(x)
+#define PRVM_DECLARE_serverglobalfunction(x)
+#define PRVM_DECLARE_clientglobalfloat(x)
+#define PRVM_DECLARE_clientglobalvector(x)
+#define PRVM_DECLARE_clientglobalstring(x)
+#define PRVM_DECLARE_clientglobaledict(x)
+#define PRVM_DECLARE_clientglobalfunction(x)
+#define PRVM_DECLARE_menuglobalfloat(x) {ev_float, #x},
+#define PRVM_DECLARE_menuglobalvector(x) {ev_vector, #x},
+#define PRVM_DECLARE_menuglobalstring(x) {ev_string, #x},
+#define PRVM_DECLARE_menuglobaledict(x) {ev_entity, #x},
+#define PRVM_DECLARE_menuglobalfunction(x) {ev_function, #x},
+#define PRVM_DECLARE_serverfieldfloat(x)
+#define PRVM_DECLARE_serverfieldvector(x)
+#define PRVM_DECLARE_serverfieldstring(x)
+#define PRVM_DECLARE_serverfieldedict(x)
+#define PRVM_DECLARE_serverfieldfunction(x)
+#define PRVM_DECLARE_clientfieldfloat(x)
+#define PRVM_DECLARE_clientfieldvector(x)
+#define PRVM_DECLARE_clientfieldstring(x)
+#define PRVM_DECLARE_clientfieldedict(x)
+#define PRVM_DECLARE_clientfieldfunction(x)
+#define PRVM_DECLARE_menufieldfloat(x)
+#define PRVM_DECLARE_menufieldvector(x)
+#define PRVM_DECLARE_menufieldstring(x)
+#define PRVM_DECLARE_menufieldedict(x)
+#define PRVM_DECLARE_menufieldfunction(x)
+#define PRVM_DECLARE_serverfunction(x)
+#define PRVM_DECLARE_clientfunction(x)
+#define PRVM_DECLARE_menufunction(x)
+#define PRVM_DECLARE_field(x)
+#define PRVM_DECLARE_global(x)
+#define PRVM_DECLARE_function(x)
+#include "prvm_offsets.h"
+#undef PRVM_DECLARE_serverglobalfloat
+#undef PRVM_DECLARE_serverglobalvector
+#undef PRVM_DECLARE_serverglobalstring
+#undef PRVM_DECLARE_serverglobaledict
+#undef PRVM_DECLARE_serverglobalfunction
+#undef PRVM_DECLARE_clientglobalfloat
+#undef PRVM_DECLARE_clientglobalvector
+#undef PRVM_DECLARE_clientglobalstring
+#undef PRVM_DECLARE_clientglobaledict
+#undef PRVM_DECLARE_clientglobalfunction
+#undef PRVM_DECLARE_menuglobalfloat
+#undef PRVM_DECLARE_menuglobalvector
+#undef PRVM_DECLARE_menuglobalstring
+#undef PRVM_DECLARE_menuglobaledict
+#undef PRVM_DECLARE_menuglobalfunction
+#undef PRVM_DECLARE_serverfieldfloat
+#undef PRVM_DECLARE_serverfieldvector
+#undef PRVM_DECLARE_serverfieldstring
+#undef PRVM_DECLARE_serverfieldedict
+#undef PRVM_DECLARE_serverfieldfunction
+#undef PRVM_DECLARE_clientfieldfloat
+#undef PRVM_DECLARE_clientfieldvector
+#undef PRVM_DECLARE_clientfieldstring
+#undef PRVM_DECLARE_clientfieldedict
+#undef PRVM_DECLARE_clientfieldfunction
+#undef PRVM_DECLARE_menufieldfloat
+#undef PRVM_DECLARE_menufieldvector
+#undef PRVM_DECLARE_menufieldstring
+#undef PRVM_DECLARE_menufieldedict
+#undef PRVM_DECLARE_menufieldfunction
+#undef PRVM_DECLARE_serverfunction
+#undef PRVM_DECLARE_clientfunction
+#undef PRVM_DECLARE_menufunction
+#undef PRVM_DECLARE_field
+#undef PRVM_DECLARE_global
+#undef PRVM_DECLARE_function
+};
-void MR_SetRouting (qboolean forceold);
+static int m_numrequiredglobals = sizeof(m_required_globals) / sizeof(m_required_globals[0]);
-void MP_Error(const char *format, ...)
+void MR_SetRouting (qbool forceold);
+
+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
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 );
+ // Let video start at least
Host_AbortCurrentFrame();
}
-void MP_Keydown (int key, char ascii)
+static void MVM_begin_increase_edicts(prvm_prog_t *prog)
{
- PRVM_Begin;
- PRVM_SetProg(PRVM_MENUPROG);
-
- // set time
- *prog->time = realtime;
+}
- // pass key
- prog->globals.generic[OFS_PARM0] = (float) key;
- prog->globals.generic[OFS_PARM1] = (float) ascii;
- PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key, float ascii) required\n");
+static void MVM_end_increase_edicts(prvm_prog_t *prog)
+{
+}
- PRVM_End;
+static void MVM_init_edict(prvm_prog_t *prog, prvm_edict_t *edict)
+{
}
-void MP_Draw (void)
+static void MVM_free_edict(prvm_prog_t *prog, prvm_edict_t *ed)
{
- PRVM_Begin;
- PRVM_SetProg(PRVM_MENUPROG);
+}
- // set time
- *prog->time = realtime;
+static void MVM_count_edicts(prvm_prog_t *prog)
+{
+ int i;
+ prvm_edict_t *ent;
+ int active;
- PRVM_ExecuteProgram(m_draw,"");
+ active = 0;
+ for (i=0 ; i<prog->num_edicts ; i++)
+ {
+ ent = PRVM_EDICT_NUM(i);
+ if (ent->free)
+ continue;
+ active++;
+ }
- PRVM_End;
+ Con_Printf("num_edicts:%3i\n", prog->num_edicts);
+ Con_Printf("active :%3i\n", active);
}
-void MP_ToggleMenu_f (void)
+static qbool MVM_load_edict(prvm_prog_t *prog, prvm_edict_t *ent)
{
- PRVM_Begin;
- PRVM_SetProg(PRVM_MENUPROG);
-
- // set time
- *prog->time = realtime;
+ return true;
+}
-#ifdef NG_MENU
- m_displayed = !m_displayed;
- if( m_displayed )
- PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_DISPLAY) - prog->functions),"");
- else
- PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_HIDE) - prog->functions),"");
-#else
- PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_TOGGLE) - prog->functions),"");
-#endif
+static void MP_KeyEvent (int key, int ascii, qbool downevent)
+{
+ prvm_prog_t *prog = MVM_prog;
- PRVM_End;
+ // pass key
+ prog->globals.fp[OFS_PARM0] = (prvm_vec_t) key;
+ prog->globals.fp[OFS_PARM1] = (prvm_vec_t) ascii;
+ if (downevent)
+ prog->ExecuteProgram(prog, PRVM_menufunction(m_keydown),"m_keydown(float key, float ascii) required");
+ else if (PRVM_menufunction(m_keyup))
+ prog->ExecuteProgram(prog, PRVM_menufunction(m_keyup),"m_keyup(float key, float ascii) required");
}
-void MP_Shutdown (void)
+static void MP_Draw (void)
{
- PRVM_Begin;
- PRVM_SetProg(PRVM_MENUPROG);
+ prvm_prog_t *prog = MVM_prog;
+ // declarations that are needed right now
- // set time
- *prog->time = realtime;
+ float oldquality;
- PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_SHUTDOWN) - prog->functions),"");
+ R_SelectScene( RST_MENU );
- // reset key_dest
- key_dest = key_game;
+ // reset the temp entities each frame
+ r_refdef.scene.numtempentities = 0;
- // AK not using this cause Im not sure whether this is useful at all instead :
- PRVM_ResetProg();
+ // menu scenes do not use reduced rendering quality
+ 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 = host.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;
+ 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;
- PRVM_End;
+ R_SelectScene( RST_CLIENT );
}
-void MP_Fallback (void)
+static void MP_ToggleMenu(int mode)
{
- MP_Shutdown();
+ prvm_prog_t *prog = MVM_prog;
+
+ prog->globals.fp[OFS_PARM0] = (prvm_vec_t) mode;
+ prog->ExecuteProgram(prog, PRVM_menufunction(m_toggle),"m_toggle(float mode) required");
+}
+
+static void MP_NewMap(void)
+{
+ prvm_prog_t *prog = MVM_prog;
+ if (PRVM_menufunction(m_newmap))
+ prog->ExecuteProgram(prog, PRVM_menufunction(m_newmap),"m_newmap() required");
+}
+const serverlist_entry_t *serverlist_callbackentry = NULL;
+static int MP_GetServerListEntryCategory(const serverlist_entry_t *entry)
+{
+ 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;
+ }
+}
+
+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;
- // init the normal menu now -> this will also correct the menu router pointers
- MR_SetRouting (TRUE);
+ // AK not using this cause Im not sure whether this is useful at all instead :
+ 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->headercrc = M_PROGHEADER_CRC;
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;
- // allocate the mempools
- prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL);
+ // 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;
- PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, 0, NULL);
+ // allocate the mempools
+ prog->progs_mempool = Mem_AllocPool(menu_progs.string, 0, NULL);
- // set m_draw and m_keydown
- m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions);
- m_keydown = (func_t) (PRVM_ED_FindFunction(M_F_KEYDOWN) - prog->functions);
+ PRVM_Prog_Load(prog, menu_progs.string, NULL, 0, m_numrequiredfunc, m_required_func, m_numrequiredfields, m_required_fields, m_numrequiredglobals, m_required_globals);
-#ifdef NG_MENU
- m_displayed = false;
-#endif
+ // note: OP_STATE is not supported by menu qc, we don't even try to detect
+ // it here
- // set time
- *prog->time = realtime;
+ in_client_mouse = true;
// call the prog init
- PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(M_F_INIT) - prog->functions),"");
-
- PRVM_End;
-}
+ prog->ExecuteProgram(prog, PRVM_menufunction(m_init),"m_init() required");
-void MP_Restart(void)
-{
- MP_Init();
+ // Once m_init was called, we consider menuqc code fully initialized.
+ prog->inittime = host.realtime;
}
//============================================================================
// Menu router
-static cvar_t forceqmenu = { 0, "forceqmenu", "0", "enables the quake menu instead of the quakec menu.dat (if present)" };
-
-void (*MR_Keydown) (int key, char ascii);
+void (*MR_KeyEvent) (int key, int ascii, qbool downevent);
void (*MR_Draw) (void);
-void (*MR_ToggleMenu_f) (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)
{
- static qboolean m_init = FALSE, mp_init = FALSE;
-
// 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_Keydown = M_Keydown;
+ MR_KeyEvent = M_KeyEvent;
MR_Draw = M_Draw;
- MR_ToggleMenu_f = M_ToggleMenu_f;
+ MR_ToggleMenu = M_ToggleMenu;
MR_Shutdown = M_Shutdown;
-
- // init
- if(!m_init)
- {
- M_Init();
- m_init = TRUE;
- }
- else
- M_Restart();
+ MR_NewMap = M_NewMap;
+ MR_GetServerListEntryCategory = M_GetServerListEntryCategory;
+ M_Init();
}
else
{
// set menu router function pointers
- MR_Keydown = MP_Keydown;
+ MR_KeyEvent = MP_KeyEvent;
MR_Draw = MP_Draw;
- MR_ToggleMenu_f = MP_ToggleMenu_f;
+ MR_ToggleMenu = MP_ToggleMenu;
MR_Shutdown = MP_Shutdown;
-
- if(!mp_init)
- {
- MP_Init();
- mp_init = TRUE;
- }
- else
- MP_Restart();
+ MR_NewMap = MP_NewMap;
+ MR_GetServerListEntryCategory = MP_GetServerListEntryCategory;
+ MP_Init();
}
}
void MR_Restart(void)
{
- MR_Shutdown ();
- MR_SetRouting (FALSE);
+ if(MR_Shutdown)
+ MR_Shutdown ();
+ 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)
{
- Host_StartVideo();
- if(MR_ToggleMenu_f)
- MR_ToggleMenu_f();
+ int m;
+ m = ((Cmd_Argc(cmd) < 2) ? -1 : atoi(Cmd_Argv(cmd, 1)));
+ CL_StartVideo();
+ if(MR_ToggleMenu)
+ MR_ToggleMenu(m);
}
void MR_Init_Commands(void)
// set router console commands
Cvar_RegisterVariable (&forceqmenu);
Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
- if (gamemode == GAME_NETHERWORLD)
- Cmd_AddCommand ("menu_fallback", MP_Fallback, "switch to engine menu (unload menu.dat)"); //Force to old-style menu
- Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat");
- Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu");
+ 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)
{
+ vid_mode_t res[1024];
+ size_t res_count, i;
+
+ res_count = VID_ListModes(res, sizeof(res) / sizeof(*res));
+ res_count = VID_SortModes(res, res_count, false, false, true);
+ if(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)
+ {
+ int n, d, t;
+ video_resolutions[i].type = "Detected mode"; // FIXME make this more dynamic
+ video_resolutions[i].width = res[i].width;
+ video_resolutions[i].height = res[i].height;
+ video_resolutions[i].pixelheight = res[i].pixelheight_num / (double) res[i].pixelheight_denom;
+ n = res[i].pixelheight_denom * video_resolutions[i].width;
+ d = res[i].pixelheight_num * video_resolutions[i].height;
+ while(d)
+ {
+ t = n;
+ n = d;
+ d = t % d;
+ }
+ d = (res[i].pixelheight_num * video_resolutions[i].height) / n;
+ n = (res[i].pixelheight_denom * video_resolutions[i].width) / n;
+ switch(n * 0x10000 | d)
+ {
+ case 0x00040003:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 480;
+ video_resolutions[i].type = "Standard 4x3";
+ break;
+ case 0x00050004:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 512;
+ if(res[i].pixelheight_denom == res[i].pixelheight_num)
+ video_resolutions[i].type = "Square Pixel (LCD) 5x4";
+ else
+ video_resolutions[i].type = "Short Pixel (CRT) 5x4";
+ break;
+ case 0x00080005:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 400;
+ if(res[i].pixelheight_denom == res[i].pixelheight_num)
+ video_resolutions[i].type = "Widescreen 8x5";
+ else
+ video_resolutions[i].type = "Tall Pixel (CRT) 8x5";
+
+ break;
+ case 0x00050003:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 384;
+ video_resolutions[i].type = "Widescreen 5x3";
+ break;
+ case 0x000D0009:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 400;
+ video_resolutions[i].type = "Widescreen 14x9";
+ break;
+ case 0x00100009:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 480;
+ video_resolutions[i].type = "Widescreen 16x9";
+ break;
+ case 0x00030002:
+ video_resolutions[i].conwidth = 720;
+ video_resolutions[i].conheight = 480;
+ video_resolutions[i].type = "NTSC 3x2";
+ break;
+ case 0x000D000B:
+ video_resolutions[i].conwidth = 720;
+ video_resolutions[i].conheight = 566;
+ video_resolutions[i].type = "PAL 14x11";
+ break;
+ case 0x00080007:
+ if(video_resolutions[i].width >= 512)
+ {
+ video_resolutions[i].conwidth = 512;
+ video_resolutions[i].conheight = 448;
+ video_resolutions[i].type = "SNES 8x7";
+ }
+ else
+ {
+ video_resolutions[i].conwidth = 256;
+ video_resolutions[i].conheight = 224;
+ video_resolutions[i].type = "NES 8x7";
+ }
+ break;
+ default:
+ video_resolutions[i].conwidth = 640;
+ video_resolutions[i].conheight = 640 * d / n;
+ video_resolutions[i].type = "Detected mode";
+ break;
+ }
+ if(video_resolutions[i].conwidth > video_resolutions[i].width || video_resolutions[i].conheight > video_resolutions[i].height)
+ {
+ int f1, f2;
+ f1 = video_resolutions[i].conwidth > video_resolutions[i].width;
+ f2 = video_resolutions[i].conheight > video_resolutions[i].height;
+ if(f1 > f2)
+ {
+ video_resolutions[i].conwidth = video_resolutions[i].width;
+ video_resolutions[i].conheight = video_resolutions[i].conheight / f1;
+ }
+ else
+ {
+ video_resolutions[i].conwidth = video_resolutions[i].conwidth / f2;
+ video_resolutions[i].conheight = video_resolutions[i].height;
+ }
+ }
+ }
+ }
+ else
+ {
+ video_resolutions = video_resolutions_hardcoded;
+ video_resolutions_count = sizeof(video_resolutions_hardcoded) / sizeof(*video_resolutions_hardcoded) - 1;
+ }
+
+ menu_video_resolutions_forfullscreen = !!vid_fullscreen.integer;
+ M_Menu_Video_FindResolution(vid.width, vid.height, vid_pixelheight.value);
+
// 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);
}
projects / xonotic / darkplaces.git / blobdiff