zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-19 15:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use FileReader consistently for loading cached nodes.

Browse source
This commit is contained in:
Christoph Oelckers 2017-12-02 12:08:28 +01:00
parent 37dc3211f7
commit 623f35073c
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/p_glnodes.cpp
View file

@ -1133,16 +1133,15 @@ static void CreateCachedNodes(MapData *map)
memcpy(compressed + offset - 4, "ZGL3", 4); memcpy(compressed + offset - 4, "ZGL3", 4);
FString path = CreateCacheName(map, true); FString path = CreateCacheName(map, true);
FILE *f = fopen(path, "wb"); FileWriter *fw = FileWriter::Open(path);
if (f != NULL) if (fw != nullptr)
{ {
if (fwrite(compressed, outlen+offset, 1, f) != 1) if (fw->Write(compressed, outlen+offset) != 1)
{ {
Printf("Error saving nodes to file %s\n", path.GetChars()); Printf("Error saving nodes to file %s\n", path.GetChars());
} }
delete fw;
fclose(f);
} }
else else
{ {
@ -1162,32 +1161,30 @@ static bool CheckCachedNodes(MapData *map)
uint32_t *verts = NULL; uint32_t *verts = NULL;
FString path = CreateCacheName(map, false); FString path = CreateCacheName(map, false);
FILE *f = fopen(path, "rb"); FileReader fr;
if (f == NULL) return false;
if (fread(magic, 1, 4, f) != 4) goto errorout; if (!fr.Open(path)) return false;
if (fr.Read(magic, 4) != 4) goto errorout;
if (memcmp(magic, "CACH", 4)) goto errorout; if (memcmp(magic, "CACH", 4)) goto errorout;
if (fread(&numlin, 4, 1, f) != 1) goto errorout; if (fr.Read(&numlin, 4) != 4) goto errorout;
numlin = LittleLong(numlin); numlin = LittleLong(numlin);
if (numlin != level.lines.Size()) goto errorout; if (numlin != level.lines.Size()) goto errorout;
if (fread(md5, 1, 16, f) != 16) goto errorout; if (fr.Read(md5, 16) != 16) goto errorout;
map->GetChecksum(md5map); map->GetChecksum(md5map);
if (memcmp(md5, md5map, 16)) goto errorout; if (memcmp(md5, md5map, 16)) goto errorout;
verts = new uint32_t[numlin * 8]; verts = new uint32_t[numlin * 8];
if (fread(verts, 8, numlin, f) != numlin) goto errorout; if (fr.Read(verts, 8 * numlin) != 8 * numlin) goto errorout;
if (fread(magic, 1, 4, f) != 4) goto errorout; if (fr.Read(magic, 4) != 4) goto errorout;
if (memcmp(magic, "ZGL2", 4) && memcmp(magic, "ZGL3", 4)) goto errorout; if (memcmp(magic, "ZGL2", 4) && memcmp(magic, "ZGL3", 4)) goto errorout;
try try
{ {
long pos = ftell(f);
FileReader fr(f);
fr.Seek(pos, SEEK_SET);
P_LoadZNodes (fr, MAKE_ID(magic[0],magic[1],magic[2],magic[3])); P_LoadZNodes (fr, MAKE_ID(magic[0],magic[1],magic[2],magic[3]));
} }
catch (CRecoverableError &error) catch (CRecoverableError &error)
@ -1208,7 +1205,6 @@ static bool CheckCachedNodes(MapData *map)
} }
delete [] verts; delete [] verts;
fclose(f);
return true; return true;
errorout: errorout:
@ -1216,7 +1212,6 @@ errorout:
{ {
delete[] verts; delete[] verts;
} }
fclose(f);
return false; return false;
} }