lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'levelflat_name' into 'next'

Browse source 
Use levelflat->name instead of flatname

See merge request STJr/SRB2!1024
This commit is contained in:
LJ Sonic 2020-07-04 08:46:04 -04:00
parent 77e39a0fd5 335fc0b327
commit 17616967d3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_setup.c
View file

@ -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)