zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed crash in GLDEFS parser caused by missing texture 

https://forum.zdoom.org/viewtopic.php?t=64234
This commit is contained in:
alexey.lysiuk 2019-04-11 13:26:10 +03:00
parent 6a3bc716e3
commit ab53509774
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/r_data/gldefs.cpp
View File

@ -1266,26 +1266,29 @@ class GLDefsParser
}
}
sc.MustGetString();
bool okay = false;
for (int i = 0; i < MAX_CUSTOM_HW_SHADER_TEXTURES; i++)
if (tex)
{
if (!tex->CustomShaderTextures[i])
bool okay = false;
for (int i = 0; i < MAX_CUSTOM_HW_SHADER_TEXTURES; i++)
{
tex->CustomShaderTextures[i] = TexMan.FindTexture(sc.String, ETextureType::Any, FTextureManager::TEXMAN_TryAny);
if (!tex->CustomShaderTextures[i])
{
sc.ScriptError("Custom hardware shader texture '%s' not found in texture '%s'\n", sc.String, tex ? tex->Name.GetChars() : "(null)");
}
tex->CustomShaderTextures[i] = TexMan.FindTexture(sc.String, ETextureType::Any, FTextureManager::TEXMAN_TryAny);
if (!tex->CustomShaderTextures[i])
{
sc.ScriptError("Custom hardware shader texture '%s' not found in texture '%s'\n", sc.String, tex->Name.GetChars());
}
texNameList.Push(textureName);
texNameIndex.Push(i);
okay = true;
break;
texNameList.Push(textureName);
texNameIndex.Push(i);
okay = true;
break;
}
}
if (!okay)
{
sc.ScriptError("Error: out of texture units in texture '%s'", tex->Name.GetChars());
}
}
if (!okay)
{
sc.ScriptError("Error: out of texture units in texture '%s'", tex ? tex->Name.GetChars() : "(null)");
}
}
else if (sc.Compare("define"))