stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-13 06:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move scope of wipelumpname

Browse source
This commit is contained in:
Jaime Passos 2019-11-15 19:09:02 -03:00
parent 41835e07ea
commit 5b0730839b
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/hardware/hw_main.c
View file

@ -7029,24 +7029,21 @@ void HWR_DrawIntermissionBG(void)
// //
// hwr mode wipes // hwr mode wipes
// //
static char wipelumpname[10];
static lumpnum_t wipelumpnum; static lumpnum_t wipelumpnum;
// puts wipe lumpname in wipename[10] // puts wipe lumpname in wipename[10]
static boolean HWR_WipeCheck(UINT8 wipenum, UINT8 scrnnum) static boolean HWR_WipeCheck(UINT8 wipenum, UINT8 scrnnum)
{ {
static char lumpname[10] = "FADEmmss";
size_t lsize; size_t lsize;
// write FADE prefix into wipelumpname
strncpy(wipelumpname, "FADEmmss", 8);
// not a valid wipe number // not a valid wipe number
if (wipenum > 99 || scrnnum > 99) if (wipenum > 99 || scrnnum > 99)
return false; // shouldn't end up here really, the loop should've stopped running beforehand return false; // shouldn't end up here really, the loop should've stopped running beforehand
// puts the numbers into the wipename // puts the numbers into the wipename
sprintf(&wipelumpname[4], "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum); sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum);
wipelumpnum = W_CheckNumForName(wipelumpname); wipelumpnum = W_CheckNumForName(lumpname);
// again, shouldn't be here really // again, shouldn't be here really
if (wipelumpnum == LUMPERROR) if (wipelumpnum == LUMPERROR)
@ -7055,7 +7052,7 @@ static boolean HWR_WipeCheck(UINT8 wipenum, UINT8 scrnnum)
lsize = W_LumpLength(wipelumpnum); lsize = W_LumpLength(wipelumpnum);
if (!(lsize == 256000 || lsize == 64000 || lsize == 16000 || lsize == 4000)) if (!(lsize == 256000 || lsize == 64000 || lsize == 16000 || lsize == 4000))
{ {
CONS_Alert(CONS_WARNING, "Fade mask lump %s of incorrect size, ignored\n", wipelumpname); CONS_Alert(CONS_WARNING, "Fade mask lump %s of incorrect size, ignored\n", lumpname);
return false; // again, shouldn't get here if it is a bad size return false; // again, shouldn't get here if it is a bad size
} }