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

10
src/gamedata/textures/texture.cpp
View file

@ -165,14 +165,14 @@ FTexture::FTexture (const char *name, int lumpnum)
}
else
{
Wads.GetLumpName (Name, lumpnum);
fileSystem.GetLumpName (Name, lumpnum);
}
}
FTexture::~FTexture ()
{
FTexture *link = Wads.GetLinkedTexture(SourceLump);
if (link == this) Wads.SetLinkedTexture(SourceLump, nullptr);
FTexture *link = fileSystem.GetLinkedTexture(SourceLump);
if (link == this) fileSystem.SetLinkedTexture(SourceLump, nullptr);
if (areas != nullptr) delete[] areas;
areas = nullptr;
@ -391,10 +391,10 @@ void FTexture::AddAutoMaterials()
if (this->*(layer.pointer) == nullptr) // only if no explicit assignment had been done.
{
FStringf lookup("%s%s%s", layer.path, bFullNameTexture ? "" : "auto/", searchname.GetChars());
auto lump = Wads.CheckNumForFullName(lookup, false, ns_global, true);
auto lump = fileSystem.CheckNumForFullName(lookup, false, ns_global, true);
if (lump != -1)
{
auto bmtex = TexMan.FindTexture(Wads.GetLumpFullName(lump), ETextureType::Any, FTextureManager::TEXMAN_TryAny);
auto bmtex = TexMan.FindTexture(fileSystem.GetLumpFullName(lump), ETextureType::Any, FTextureManager::TEXMAN_TryAny);
if (bmtex != nullptr)
{
bmtex->bMasked = false;