OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- put the entire filesystem code into a namespace and created some subdirectories.

Browse source
This commit is contained in:
Christoph Oelckers 2023-08-22 21:20:28 +02:00
commit ebb71cebf1
108 changed files with 308 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gamedata/g_mapinfo.cpp
View file

@ -2596,7 +2596,7 @@ void G_ParseMapInfo (FString basemapinfo)
// If that exists we need to skip this one.
int wad = fileSystem.GetFileContainer(lump);
int altlump = fileSystem.CheckNumForName("ZMAPINFO", ns_global, wad, true);
int altlump = fileSystem.CheckNumForName("ZMAPINFO", FileSys::ns_global, wad, true);
if (altlump >= 0) continue;
}
@ -2604,9 +2604,9 @@ void G_ParseMapInfo (FString basemapinfo)
{
// MAPINFO and ZMAPINFO will override UMAPINFO if in the same WAD.
int wad = fileSystem.GetFileContainer(lump);
int altlump = fileSystem.CheckNumForName("ZMAPINFO", ns_global, wad, true);
int altlump = fileSystem.CheckNumForName("ZMAPINFO", FileSys::ns_global, wad, true);
if (altlump >= 0) continue;
altlump = fileSystem.CheckNumForName("MAPINFO", ns_global, wad, true);
altlump = fileSystem.CheckNumForName("MAPINFO", FileSys::ns_global, wad, true);
if (altlump >= 0) continue;
}
if (nindex != 2)