zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-29 13:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- buildtiles.h cleaned of merge errors.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-25 16:53:35 +02:00
parent 1d065085d4
commit 7c3cac5721
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/textures/buildtiles.cpp
View file

@ -130,7 +130,7 @@ static FTexture* GetTileTexture(const char* name, const TArray<uint8_t>& backing
void BuildTiles::Init() void BuildTiles::Init()
{ {
auto Placeholder = TexMan.ByIndex(0); Placeholder = TexMan.ByIndex(0);
for (auto& tile : tiledata) for (auto& tile : tiledata)
{ {
tile.texture = Placeholder; tile.texture = Placeholder;

6
source/core/textures/buildtiles.h
View file

@ -272,7 +272,6 @@ struct BuildTiles
FTexture* Placeholder; FTexture* Placeholder;
TDeletingArray<BuildArtFile*> ArtFiles; TDeletingArray<BuildArtFile*> ArtFiles;
TileDesc tiledata[MAXTILES]; TileDesc tiledata[MAXTILES];
TDeletingArray<BuildArtFile*> PerMapArtFiles;
TArray<FString> addedArt; TArray<FString> addedArt;
TMap<FTexture*, int> TextureToTile; TMap<FTexture*, int> TextureToTile;
TArray<FString> maptilesadded; TArray<FString> maptilesadded;
@ -284,7 +283,6 @@ struct BuildTiles
} }
void CloseAll(); void CloseAll();
FTexture* GetTexture(const char* path);
void AddTile(int tilenum, FTexture* tex, bool permap = false); void AddTile(int tilenum, FTexture* tex, bool permap = false);
@ -292,15 +290,13 @@ struct BuildTiles
void AddFile(BuildArtFile* bfd, bool permap) void AddFile(BuildArtFile* bfd, bool permap)
{ {
if (!permap) ArtFiles.Push(bfd); ArtFiles.Push(bfd);
else PerMapArtFiles.Push(bfd);
} }
int FindFile(const FString& filename) int FindFile(const FString& filename)
{ {
return ArtFiles.FindEx([filename](const BuildArtFile* element) { return filename.CompareNoCase(element->filename) == 0; }); 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); int LoadArtFile(const char* file, const char* mapname = nullptr, int firsttile = -1);
void CloseAllMapArt();
void LoadArtSet(const char* filename); void LoadArtSet(const char* filename);
void AddArt(TArray<FString>& art) void AddArt(TArray<FString>& art)
{ {