static int NehGameType;
enum m_state_e m_state;
-char m_return_reason[32];
+char m_return_reason[128];
void M_Menu_Main_f (void);
void M_Menu_SinglePlayer_f (void);
static qboolean m_entersound; ///< play after drawing a frame, so caching won't disrupt the sound
-void M_Update_Return_Reason(char *s)
+void M_Update_Return_Reason(const char *s)
{
strlcpy(m_return_reason, s, sizeof(m_return_reason));
if (s)
#define NumberOfNehahraDemos 34
typedef struct nehahrademonames_s
{
- char *name;
- char *desc;
+ const char *name;
+ const char *desc;
} nehahrademonames_t;
static nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
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_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
char temp[2];
temp[0] = num;
temp[1] = 0;
- DrawQ_String_Font(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
}
static void M_PrintColored(float cx, float cy, const char *str)
{
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
}
static void M_Print(float cx, float cy, const char *str)
{
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
}
static void M_PrintRed(float cx, float cy, const char *str)
{
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
}
static void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
{
if (unghosted)
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
else
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true, FONT_MENU);
}
static void M_DrawPic(float cx, float cy, const char *picname)
/*
================
-M_ToggleMenu_f
+M_ToggleMenu
================
*/
-void M_ToggleMenu_f (void)
+void M_ToggleMenu(int mode)
{
m_entersound = true;
if ((key_dest != key_menu && key_dest != key_menu_grabbed) || m_state != m_main)
{
- if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "1"))
- return;
+ if(mode == 0)
+ return; // the menu is off, and we want it off
M_Menu_Main_f ();
}
else
{
- if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "0"))
- return;
+ if(mode == 1)
+ return; // the menu is on, and we want it on
key_dest = key_game;
m_state = m_none;
}
{
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)
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++)
{
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_Simple(&t, false, false);
- version = atoi(com_token);
+ //version = atoi(com_token);
// description
COM_ParseToken_Simple(&t, false, false);
strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
{
if (!sv.active)
return;
+#if 1
+ // LordHavoc: 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;
static int setup_cursor = 4;
static int setup_cursor_table[] = {40, 64, 88, 124, 140};
-static char setup_myname[32];
+static char setup_myname[MAX_SCOREBOARDNAME];
static int setup_oldtop;
static int setup_oldbottom;
static int setup_top;
typedef struct ratetable_s
{
int rate;
- char *name;
+ const char *name;
}
ratetable_t;
//=============================================================================
/* KEYS MENU */
-static char *quakebindnames[][2] =
+static const char *quakebindnames[][2] =
{
{"+attack", "attack"},
{"impulse 10", "next weapon"},
{"+movedown", "swim down"}
};
-static char *transfusionbindnames[][2] =
+static const char *transfusionbindnames[][2] =
{
{"", "Movement"}, // Movement commands
{"+forward", "walk forward"},
{"impulse 79", "taunt 9"}
};
-static char *goodvsbad2bindnames[][2] =
+static const char *goodvsbad2bindnames[][2] =
{
{"impulse 69", "Power 1"},
{"impulse 70", "Power 2"},
};
static int numcommands;
-static char *(*bindnames)[2];
+static const char *(*bindnames)[2];
/*
typedef struct binditem_s
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");
}
}
-static 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++)
{
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
if (keys[0] == -1)
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]);
//=============================================================================
/* QUIT MENU */
-static char *m_quit_message[9];
+static const char *m_quit_message[9];
static int m_quit_prevstate;
static qboolean wasInMenus;
-static 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;
{
cachepic_t *p;
int basex;
- char *startJoin;
- char *protocol;
+ const char *startJoin;
+ const char *protocol;
M_Background(320, 200);
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;
{GAME_OPENQUARTZ, &openquartzgame, &openquartzgame},
{GAME_DEFEATINDETAIL2, &defeatindetail2game, &defeatindetail2game},
{GAME_PRYDON, &prydongame, &prydongame},
- {GAME_NORMAL, NULL, NULL} // terminator
};
-static gamelevels_t *lookupgameinfo(void)
-{
- int i = 0;
- while (gamelist[i].gameid != gamemode)
- {
- if (gamelist[i].notregistered == NULL)
- {
- i = 0;
- break;
- }
- i++;
- }
- if (registered.integer)
- return gamelist[i].registered;
- else
- return gamelist[i].notregistered;
-}
+static gamelevels_t *gameoptions_levels = NULL;
static int startepisode;
static int startlevel;
void M_Menu_GameOptions_f (void)
{
+ 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;
}
{
cachepic_t *p;
int x;
- gamelevels_t *g;
M_Background(320, 200);
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)
{
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)
static void M_NetStart_Change (int dir)
{
- gamelevels_t *g;
int count;
switch (gameoptions_cursor)
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;
}
static void M_GameOptions_Key (int key, int ascii)
{
- gamelevels_t *g;
int l;
char hostnamebuf[128];
Cbuf_AddText ("disconnect\n");
Cbuf_AddText ( va ("maxplayers %u\n", maxplayers) );
- g = lookupgameinfo();
- Cbuf_AddText ( va ("map %s\n", g->levels[g->episodes[startepisode].firstLevel + startlevel].name) );
+ Cbuf_AddText ( va ("map %s\n", gameoptions_levels->levels[gameoptions_levels->episodes[startepisode].firstLevel + startlevel].name) );
return;
}
{
for (n = start;n < end;n++)
{
+ serverlist_entry_t *entry = ServerList_GetViewEntry(n);
DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
- M_PrintColored(0, y, serverlist_viewlist[n]->line1);y += 8;
- M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8;
+ M_PrintColored(0, y, entry->line1);y += 8;
+ M_PrintColored(0, y, entry->line2);y += 8;
}
}
else if (realtime - masterquerytime > 10)
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(va("connect \"%s\"\n", ServerList_GetViewEntry(slist_cursor)->info.cname));
break;
default:
static int modlist_cursor;
//static int modlist_viewcount;
-#define MODLIST_TOTALSIZE 256
static int modlist_count = 0;
static modlist_entry_t modlist[MODLIST_TOTALSIZE];
if (modlist_count >= MODLIST_TOTALSIZE) break;
// check all dirs to see if they "appear" to be mods
// reject any dirs that are part of the base game
- // (such as "id1" and "hipnotic" when in GAME_HIPNOTIC mode)
if (gamedirname1 && !strcasecmp(gamedirname1, list.strings[i])) continue;
- if (gamedirname2 && !strcasecmp(gamedirname2, list.strings[i])) continue;
+ //if (gamedirname2 && !strcasecmp(gamedirname2, list.strings[i])) continue;
if (FS_CheckNastyPath (list.strings[i], true)) continue;
if (!FS_CheckGameDir(list.strings[i])) continue;
static void M_KeyEvent(int key, int ascii, qboolean downevent);
static void M_Draw(void);
-void M_ToggleMenu_f(void);
+void M_ToggleMenu(int mode);
static void M_Shutdown(void);
void M_Init (void)
Cmd_AddCommand ("menu_transfusion_episode", M_Menu_Transfusion_Episode_f, "open the transfusion episode select menu");
Cmd_AddCommand ("menu_transfusion_skill", M_Menu_Transfusion_Skill_f, "open the transfusion skill select menu");
Cmd_AddCommand ("menu_credits", M_Menu_Credits_f, "open the credits menu");
-
- if (gamemode == GAME_TRANSFUSION)
- {
- 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;
- }
-
- // 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++;
-
- // Only sections? There may be a problem somewhere...
- if (keys_cursor >= numcommands)
- Sys_Error ("M_Init: The key binding list only contains sections");
- }
-
-
- if (gamemode == GAME_NEHAHRA)
- {
- if (FS_FileExists("maps/neh1m4.bsp"))
- {
- 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;
- }
- }
- else
- {
- 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...
- }
- }
- }
}
void M_Draw (void)
}
-void M_Shutdown(void)
+void M_NewMap(void)
{
- // reset key_dest
- key_dest = key_game;
}
-void M_Restart(void)
+void M_Shutdown(void)
{
+ // reset key_dest
+ key_dest = key_game;
}
//============================================================================
// Menu prog handling
-static char *m_required_func[] = {
+static const char *m_required_func[] = {
"m_init",
"m_keydown",
"m_draw",
static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*);
+static prvm_required_field_t m_required_fields[] =
+{
+ {ev_string, "classname"}, // menu field
+};
+
+static int m_numrequiredfields = sizeof(m_required_fields) / sizeof(m_required_fields[0]);
+
+static prvm_required_field_t m_required_globals[] =
+{
+ {ev_entity, "self"}, // menu global
+ {ev_float, "drawfont"}, // menu global
+ {ev_float, "require_spawnfunc_prefix"}, // menu global
+ {ev_vector, "drawfontscale"}, // menu global
+};
+
+static int m_numrequiredglobals = sizeof(m_required_globals) / sizeof(m_required_globals[0]);
+
void MR_SetRouting (qboolean forceold);
void MP_Error(const char *format, ...) DP_FUNC_PRINTF(1);
R_SelectScene( RST_CLIENT );
}
-void MP_ToggleMenu_f (void)
+void MP_ToggleMenu(int mode)
{
PRVM_Begin;
PRVM_SetProg(PRVM_MENUPROG);
+ prog->globals.generic[OFS_PARM0] = (float) mode;
PRVM_ExecuteProgram(prog->funcoffsets.m_toggle,"m_toggle() required");
PRVM_End;
}
+void MP_NewMap(void)
+{
+ PRVM_Begin;
+ PRVM_SetProg(PRVM_MENUPROG);
+ if (prog->funcoffsets.m_newmap)
+ PRVM_ExecuteProgram(prog->funcoffsets.m_newmap,"m_newmap() required");
+ PRVM_End;
+}
+
void MP_Shutdown (void)
{
PRVM_Begin;
// allocate the mempools
prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL);
- PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, 0, NULL, 0, NULL);
+ PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, m_numrequiredfields, m_required_fields, m_numrequiredglobals, m_required_globals);
// note: OP_STATE is not supported by menu qc, we don't even try to detect
// it here
PRVM_End;
}
-void MP_Restart(void)
-{
- MP_Init();
-}
-
//============================================================================
// Menu router
void (*MR_KeyEvent) (int key, int ascii, qboolean downevent);
void (*MR_Draw) (void);
-void (*MR_ToggleMenu_f) (void);
+void (*MR_ToggleMenu) (int mode);
void (*MR_Shutdown) (void);
+void (*MR_NewMap) (void);
void MR_SetRouting(qboolean 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)
{
// set menu router function pointers
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;
+ M_Init();
}
else
{
// set menu router function pointers
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;
+ MP_Init();
}
}
void MR_Restart(void)
{
- MR_Shutdown ();
+ if(MR_Shutdown)
+ MR_Shutdown ();
MR_SetRouting (FALSE);
}
void Call_MR_ToggleMenu_f(void)
{
+ int m;
+ m = ((Cmd_Argc() < 2) ? -1 : atoi(Cmd_Argv(1)));
Host_StartVideo();
- if(MR_ToggleMenu_f)
- MR_ToggleMenu_f();
+ if(MR_ToggleMenu)
+ MR_ToggleMenu(m);
}
void MR_Init_Commands(void)
projects / xonotic / darkplaces.git / blobdiff