diff --git a/source/core/textures/buildtiles.cpp b/source/core/textures/buildtiles.cpp index f6af79c25..cbee3730e 100644 --- a/source/core/textures/buildtiles.cpp +++ b/source/core/textures/buildtiles.cpp @@ -130,7 +130,7 @@ static FTexture* GetTileTexture(const char* name, const TArray& backing void BuildTiles::Init() { - auto Placeholder = TexMan.ByIndex(0); + Placeholder = TexMan.ByIndex(0); for (auto& tile : tiledata) { tile.texture = Placeholder; diff --git a/source/core/textures/buildtiles.h b/source/core/textures/buildtiles.h index 62a67b969..d4bd5e831 100644 --- a/source/core/textures/buildtiles.h +++ b/source/core/textures/buildtiles.h @@ -272,7 +272,6 @@ struct BuildTiles FTexture* Placeholder; TDeletingArray ArtFiles; TileDesc tiledata[MAXTILES]; - TDeletingArray PerMapArtFiles; TArray addedArt; TMap TextureToTile; TArray maptilesadded; @@ -284,7 +283,6 @@ struct BuildTiles } void CloseAll(); - FTexture* GetTexture(const char* path); void AddTile(int tilenum, FTexture* tex, bool permap = false); @@ -292,15 +290,13 @@ struct BuildTiles void AddFile(BuildArtFile* bfd, bool permap) { - if (!permap) ArtFiles.Push(bfd); - else PerMapArtFiles.Push(bfd); + ArtFiles.Push(bfd); } int FindFile(const FString& filename) { return ArtFiles.FindEx([filename](const BuildArtFile* element) { return filename.CompareNoCase(element->filename) == 0; }); } int LoadArtFile(const char* file, const char* mapname = nullptr, int firsttile = -1); - void CloseAllMapArt(); void LoadArtSet(const char* filename); void AddArt(TArray& art) {