OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- more file system refactoring.

Browse source 
* moved the sprite renaming out of the file system entirely into a caller-provided callback.
* renamed several functions to closer match the terms of a file system.
* moved the VM interface out of the implementation.
This commit is contained in:
Christoph Oelckers 2020-04-11 13:26:42 +02:00
commit c1bb7de23a
61 changed files with 927 additions and 765 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/maploader/glnodes.cpp
View file

@ -752,7 +752,7 @@ static int FindGLNodesInWAD(int labellump)
{
if (fileSystem.GetLumpFile(lump)==wadfile)
{
FMemLump mem = fileSystem.ReadLump(lump);
FileData mem = fileSystem.ReadLump(lump);
if (MatchHeader(fileSystem.GetLumpFullName(labellump), (const char *)mem.GetMem())) return lump;
}
}
@ -858,7 +858,7 @@ bool MapLoader::LoadGLNodes(MapData * map)
bool mapinwad = map->InWad;
FResourceFile * f_gwa = map->resource;
const char * name = fileSystem.GetWadFullName(lumpfile);
const char * name = fileSystem.GetResourceFileFullName(lumpfile);
if (mapinwad)
{