mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-26 22:31:10 +00:00
Fix #1277
This commit is contained in:
parent
8a6beee52a
commit
3c1736ebf8
2 changed files with 10 additions and 5 deletions
|
@ -28,6 +28,12 @@ static inline int lib_freeslot(lua_State *L)
|
||||||
if (!lua_lumploading)
|
if (!lua_lumploading)
|
||||||
return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
|
return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
|
||||||
|
|
||||||
|
if (!deh_loaded)
|
||||||
|
{
|
||||||
|
initfreeslots();
|
||||||
|
deh_loaded = true;
|
||||||
|
}
|
||||||
|
|
||||||
while (n-- > 0)
|
while (n-- > 0)
|
||||||
{
|
{
|
||||||
s = Z_StrDup(luaL_checkstring(L,1));
|
s = Z_StrDup(luaL_checkstring(L,1));
|
||||||
|
|
|
@ -192,7 +192,10 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
if (!deh_loaded)
|
if (!deh_loaded)
|
||||||
|
{
|
||||||
initfreeslots();
|
initfreeslots();
|
||||||
|
deh_loaded = true;
|
||||||
|
}
|
||||||
|
|
||||||
deh_num_warning = 0;
|
deh_num_warning = 0;
|
||||||
|
|
||||||
|
@ -605,14 +608,10 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
|
||||||
if (deh_num_warning)
|
if (deh_num_warning)
|
||||||
{
|
{
|
||||||
CONS_Printf(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s");
|
CONS_Printf(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s");
|
||||||
if (devparm) {
|
if (devparm)
|
||||||
I_Error("%s%s",va(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s"), M_GetText("See log.txt for details.\n"));
|
I_Error("%s%s",va(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s"), M_GetText("See log.txt for details.\n"));
|
||||||
//while (!I_GetKey())
|
|
||||||
//I_OsPolling();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
deh_loaded = true;
|
|
||||||
Z_Free(s);
|
Z_Free(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue