thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail

Browse source 
# Conflicts:
#	src/d_clisrv.c
This commit is contained in:
toaster 2022-03-18 13:07:47 +00:00
parent 1219f36ca2
commit c67b52f85d
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_clisrv.c
View file

@ -1276,10 +1276,6 @@ static void CL_LoadReceivedSavegame(boolean reloading)
CON_LogMessage("\"\n"); CON_LogMessage("\"\n");
} }
} }
else
{
CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
}
// done // done
Z_Free(savebuffer); Z_Free(savebuffer);

18
src/p_saveg.c
View file

@ -4525,7 +4525,10 @@ static inline boolean P_NetUnArchiveMisc(boolean reloading)
encoremode = (boolean)READUINT8(save_p); encoremode = (boolean)READUINT8(save_p);
if (!P_LoadLevel(true, reloading)) if (!P_LoadLevel(true, reloading))
{
CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
return false; return false;
}
// get the time // get the time
leveltime = READUINT32(save_p); leveltime = READUINT32(save_p);
@ -4652,19 +4655,26 @@ static inline boolean P_UnArchiveLuabanksAndConsistency(void)
{ {
switch (READUINT8(save_p)) switch (READUINT8(save_p))
{ {
case 0xb7: case 0xb7: // luabanks marker
{ {
UINT8 i, banksinuse = READUINT8(save_p); UINT8 i, banksinuse = READUINT8(save_p);
if (banksinuse > NUM_LUABANKS) if (banksinuse > NUM_LUABANKS)
{
CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Too many banks in use)\n"));
return false; return false;
}
for (i = 0; i < banksinuse; i++) for (i = 0; i < banksinuse; i++)
luabanks[i] = READINT32(save_p); luabanks[i] = READINT32(save_p);
if (READUINT8(save_p) != 0x1d) if (READUINT8(save_p) != 0x1d) // consistency marker
{
CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Failed consistency check)\n"));
return false; return false;
}
} }
case 0x1d: case 0x1d: // consistency marker
break; break;
default: default: // anything else is nonsense
CONS_Alert(CONS_ERROR, M_GetText("Failed consistency check (???)\n"));
return false; return false;
} }