Probably some bugs fixed.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1000 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
8911d2f3d5
commit
50b566ea79
1 changed files with 7 additions and 0 deletions
|
@ -1217,17 +1217,22 @@ void MP_Init (void)
|
||||||
menutime = Sys_DoubleTime();
|
menutime = Sys_DoubleTime();
|
||||||
if (!menuprogs)
|
if (!menuprogs)
|
||||||
{
|
{
|
||||||
|
Con_DPrintf("Initializing menu.dat\n");
|
||||||
menuprogs = InitProgs(&menuprogparms);
|
menuprogs = InitProgs(&menuprogparms);
|
||||||
PR_Configure(menuprogs, -1, 1);
|
PR_Configure(menuprogs, -1, 1);
|
||||||
if (PR_LoadProgs(menuprogs, "menu.dat", 10020, NULL, 0) < 0) //no per-progs builtins.
|
if (PR_LoadProgs(menuprogs, "menu.dat", 10020, NULL, 0) < 0) //no per-progs builtins.
|
||||||
{
|
{
|
||||||
//failed to load or something
|
//failed to load or something
|
||||||
|
// CloseProgs(menuprogs);
|
||||||
|
// menuprogs = NULL;
|
||||||
M_Init_Internal();
|
M_Init_Internal();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (setjmp(mp_abort))
|
if (setjmp(mp_abort))
|
||||||
{
|
{
|
||||||
M_Init_Internal();
|
M_Init_Internal();
|
||||||
|
Con_DPrintf("Failed to initialize menu.dat\n");
|
||||||
|
inmenuprogs = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
inmenuprogs++;
|
inmenuprogs++;
|
||||||
|
@ -1253,6 +1258,8 @@ void MP_Init (void)
|
||||||
if (mp_init_function)
|
if (mp_init_function)
|
||||||
PR_ExecuteProgram(menuprogs, mp_init_function);
|
PR_ExecuteProgram(menuprogs, mp_init_function);
|
||||||
inmenuprogs--;
|
inmenuprogs--;
|
||||||
|
|
||||||
|
Con_DPrintf("Initialized menu.dat\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue