qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

use the new pr load hook for resolving the globals

Browse source
This commit is contained in:
Bill Currie 2003-11-20 08:02:32 +00:00
parent e74cd75a0d
commit 7ea30f3f87
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libs/console/menu.c
View file

@ -87,20 +87,20 @@ static func_t menu_draw_hud;
static const char *top_menu; static const char *top_menu;
static int static int
menu_resolve_globals (void) menu_resolve_globals (progs_t *pr)
{ {
const char *sym; const char *sym;
dfunction_t *f; dfunction_t *f;
if (!(f = ED_FindFunction (&menu_pr_state, sym = "menu_init"))) if (!(f = ED_FindFunction (pr, sym = "menu_init")))
goto error; goto error;
menu_init = (func_t)(f - menu_pr_state.pr_functions); menu_init = (func_t)(f - menu_pr_state.pr_functions);
if (!(f = ED_FindFunction (&menu_pr_state, sym = "menu_draw_hud"))) if (!(f = ED_FindFunction (pr, sym = "menu_draw_hud")))
goto error; goto error;
menu_draw_hud = (func_t)(f - menu_pr_state.pr_functions); menu_draw_hud = (func_t)(f - pr->pr_functions);
return 1; return 1;
error: error:
Con_Printf ("%s: undefined function %s\n", menu_pr_state.progs_name, sym); Con_Printf ("%s: undefined function %s\n", pr->progs_name, sym);
return 0; return 0;
} }
@ -459,6 +459,8 @@ Menu_Init (void)
PR_Cmds_Init (&menu_pr_state); PR_Cmds_Init (&menu_pr_state);
R_Progs_Init (&menu_pr_state); R_Progs_Init (&menu_pr_state);
PR_AddLoadFunc (&menu_pr_state, menu_resolve_globals);
confirm_quit = Cvar_Get ("confirm_quit", "1", CVAR_ARCHIVE, NULL, confirm_quit = Cvar_Get ("confirm_quit", "1", CVAR_ARCHIVE, NULL,
"confirm quit command"); "confirm quit command");
@ -480,19 +482,14 @@ Menu_Load (void)
menu = 0; menu = 0;
top_menu = 0; top_menu = 0;
menu_pr_state.progs = 0;
if ((size = QFS_FOpenFile (menu_pr_state.progs_name, &file)) != -1) { if ((size = QFS_FOpenFile (menu_pr_state.progs_name, &file)) != -1) {
PR_LoadProgsFile (&menu_pr_state, file, size, 0, 256 * 1024); PR_LoadProgsFile (&menu_pr_state, file, size, 0, 256 * 1024);
Qclose (file); Qclose (file);
if (!PR_RelocateBuiltins (&menu_pr_state) if (!PR_RunLoadFuncs (&menu_pr_state)) {
|| !PR_ResolveGlobals (&menu_pr_state)
|| !menu_resolve_globals ()) {
free (menu_pr_state.progs); free (menu_pr_state.progs);
menu_pr_state.progs = 0; menu_pr_state.progs = 0;
} else {
PR_LoadStrings (&menu_pr_state);
PR_LoadDebug (&menu_pr_state);
PR_Check_Opcodes (&menu_pr_state);
} }
} }
if (!menu_pr_state.progs) { if (!menu_pr_state.progs) {
@ -503,7 +500,6 @@ Menu_Load (void)
Con_SetOrMask (0x00); Con_SetOrMask (0x00);
return; return;
} }
PR_InitRuntime (&menu_pr_state);
Cbuf_Progs_SetCbuf (&menu_pr_state, con_data.cbuf); Cbuf_Progs_SetCbuf (&menu_pr_state, con_data.cbuf);
InputLine_Progs_SetDraw (&menu_pr_state, C_DrawInputLine); InputLine_Progs_SetDraw (&menu_pr_state, C_DrawInputLine);
PR_ExecuteProgram (&menu_pr_state, menu_init); PR_ExecuteProgram (&menu_pr_state, menu_init);