Merge branch 'levelflat_name' into 'next'
Use levelflat->name instead of flatname See merge request STJr/SRB2!1024
This commit is contained in:
commit
17616967d3
|
@ -575,9 +575,9 @@ Ploadflat (levelflat_t *levelflat, const char *flatname, boolean resize)
|
||||||
strupr(levelflat->name);
|
strupr(levelflat->name);
|
||||||
|
|
||||||
/* If we can't find a flat, try looking for a texture! */
|
/* If we can't find a flat, try looking for a texture! */
|
||||||
if (( flatnum = R_GetFlatNumForName(flatname) ) == LUMPERROR)
|
if (( flatnum = R_GetFlatNumForName(levelflat->name) ) == LUMPERROR)
|
||||||
{
|
{
|
||||||
if (( texturenum = R_CheckTextureNumForName(flatname) ) == -1)
|
if (( texturenum = R_CheckTextureNumForName(levelflat->name) ) == -1)
|
||||||
{
|
{
|
||||||
// check for REDWALL
|
// check for REDWALL
|
||||||
if (( texturenum = R_CheckTextureNumForName("REDWALL") ) != -1)
|
if (( texturenum = R_CheckTextureNumForName("REDWALL") ) != -1)
|
||||||
|
|
Loading…
Reference in a new issue