- fix loading of CRC cache if file does not exist.

This commit is contained in:
Mitchell Richters 2020-04-15 21:35:16 +10:00 committed by Christoph Oelckers
parent 4654fd648d
commit 587a5d5d9a
2 changed files with 14 additions and 12 deletions

View file

@ -1119,7 +1119,7 @@ void FScanner::CheckOpen()
{
if (ScriptOpen == false)
{
I_FatalError ("SC_ call before SC_Open().");
I_Error ("SC_ call before SC_Open().");
}
}

View file

@ -328,18 +328,20 @@ static TArray<FileEntry> LoadCRCCache(void)
try
{
sc.OpenFile(cachepath);
while (sc.GetString())
if (sc.OpenFile(cachepath))
{
crclist.Reserve(1);
auto &flentry = crclist.Last();
flentry.FileName = sc.String;
sc.MustGetNumber();
flentry.FileLength = sc.BigNumber;
sc.MustGetNumber();
flentry.FileTime = sc.BigNumber;
sc.MustGetNumber();
flentry.CRCValue = (unsigned)sc.BigNumber;
while (sc.GetString())
{
crclist.Reserve(1);
auto &flentry = crclist.Last();
flentry.FileName = sc.String;
sc.MustGetNumber();
flentry.FileLength = sc.BigNumber;
sc.MustGetNumber();
flentry.FileTime = sc.BigNumber;
sc.MustGetNumber();
flentry.CRCValue = (unsigned)sc.BigNumber;
}
}
}
catch (CRecoverableError &)