OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- renamed the file system related classes to actually use the term "FileSystem".

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 13:24:34 +02:00
commit 6bccde3b51
103 changed files with 647 additions and 647 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/console/c_bind.cpp
View file

@ -688,7 +688,7 @@ void C_BindDefaults ()
{
int lump, lastlump = 0;
while ((lump = Wads.FindLump("DEFBINDS", &lastlump)) != -1)
while ((lump = fileSystem.FindLump("DEFBINDS", &lastlump)) != -1)
{
FScanner sc(lump);

12
src/console/c_cmds.cpp
View file

@ -848,17 +848,17 @@ CCMD (wdir)
Printf ("usage: wdir <wadfile>\n");
return;
}
int wadnum = Wads.CheckIfWadLoaded (argv[1]);
int wadnum = fileSystem.CheckIfWadLoaded (argv[1]);
if (wadnum < 0)
{
Printf ("%s must be loaded to view its directory.\n", argv[1]);
return;
}
for (int i = 0; i < Wads.GetNumLumps(); ++i)
for (int i = 0; i < fileSystem.GetNumLumps(); ++i)
{
if (Wads.GetLumpFile(i) == wadnum)
if (fileSystem.GetLumpFile(i) == wadnum)
{
Printf ("%s\n", Wads.GetLumpFullName(i));
Printf ("%s\n", fileSystem.GetLumpFullName(i));
}
}
}
@ -1221,10 +1221,10 @@ CCMD(secret)
bool thislevel = !stricmp(mapname, primaryLevel->MapName);
bool foundsome = false;
int lumpno=Wads.CheckNumForName("SECRETS");
int lumpno=fileSystem.CheckNumForName("SECRETS");
if (lumpno < 0) return;
auto lump = Wads.OpenLumpReader(lumpno);
auto lump = fileSystem.OpenLumpReader(lumpno);
FString maphdr;
maphdr.Format("[%s]", mapname);

4
src/console/c_cvars.cpp
View file

@ -1796,10 +1796,10 @@ void C_GrabCVarDefaults ()
int lumpversion, gamelastrunversion;
gamelastrunversion = atoi(LASTRUNVERSION);
while ((lump = Wads.FindLump("DEFCVARS", &lastlump)) != -1)
while ((lump = fileSystem.FindLump("DEFCVARS", &lastlump)) != -1)
{
// don't parse from wads
if (lastlump > Wads.GetLastLump(Wads.GetMaxIwadNum()))
if (lastlump > fileSystem.GetLastLump(fileSystem.GetMaxIwadNum()))
I_FatalError("Cannot load DEFCVARS from a wadfile!\n");
FScanner sc(lump);