OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- store longName in a std::string and use std::vector for FileInfo

Browse source 
TArray cannot handle std::string so this must both be changed together.
This commit is contained in:
Christoph Oelckers 2023-08-19 22:08:59 +02:00
commit ca1d7fd539
3 changed files with 102 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/common/textures/texturemanager.cpp
View file

@ -679,15 +679,15 @@ void FTextureManager::AddHiresTextures (int wadnum)
void FTextureManager::LoadTextureDefs(int wadnum, const char *lumpname, FMultipatchTextureBuilder &build)
{
int remapLump, lastLump;
int texLump, lastLump;
lastLump = 0;
while ((remapLump = fileSystem.FindLump(lumpname, &lastLump)) != -1)
while ((texLump = fileSystem.FindLump(lumpname, &lastLump)) != -1)
{
if (fileSystem.GetFileContainer(remapLump) == wadnum)
if (fileSystem.GetFileContainer(texLump) == wadnum)
{
ParseTextureDef(remapLump, build);
ParseTextureDef(texLump, build);
}
}
}