zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 12:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use a TArray in BuildTiles for the tile descriptors.

Browse source 
For some reason MSVC wants to put this in the EXE now and the array is quite large.
This commit is contained in:
Christoph Oelckers 2022-12-06 22:30:52 +01:00
parent 71ca2c4677
commit aa58b152ab
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/common/utility/tarray.h
View file

@ -213,7 +213,7 @@ public:
{ {
} }
//////// ////////
TArray () constexpr TArray ()
{ {
Most = 0; Most = 0;
Count = 0; Count = 0;

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

@ -225,13 +225,12 @@ static FGameTexture* GetTileTexture(const char* name, const TArray<uint8_t>& bac
void BuildTiles::Init() void BuildTiles::Init()
{ {
Placeholder = TexMan.GameByIndex(0); Placeholder = TexMan.GameByIndex(0);
tiledata.Resize(MAXTILES);
memset(tiledata.Data(), 0, sizeof(tiledata[0]) * MAXTILES);
for (auto& tile : tiledata) for (auto& tile : tiledata)
{ {
tile.texture = Placeholder; tile.texture = Placeholder;
tile.picanm = {};
tile.replacement = ReplacementType::Art;
tile.alphaThreshold = 0.5; tile.alphaThreshold = 0.5;
tile.hiofs = {};
} }
} }

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

@ -284,7 +284,7 @@ struct BuildTiles
{ {
FGameTexture* Placeholder; FGameTexture* Placeholder;
TDeletingArray<BuildArtFile*> ArtFiles; TDeletingArray<BuildArtFile*> ArtFiles;
TileDesc tiledata[MAXTILES]; TArray<TileDesc> tiledata;
TArray<FString> addedArt; TArray<FString> addedArt;
TMap<FName, int> nametoindex; TMap<FName, int> nametoindex;
TMap<int, int> textotile; TMap<int, int> textotile;