Skip to content
Snippets Groups Projects
Commit 9a2e65c6 authored by Sal's avatar Sal
Browse files

Merge branch 'next' into version-prep

parents 75b0dd3c 8e41f09c
Branches version-prep
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 2 deletions
src/f_wipe.c
+ 9
− 2
View file @ 9a2e65c6
...@@ -97,7 +97,7 @@ static fixed_t paldiv; ...@@ -97,7 +97,7 @@ static fixed_t paldiv;
* \return fademask_t for lump * \return fademask_t for lump
*/ */
static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) { static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) {
static char lumpname[10] = "FADEmmss"; static char lumpname[9] = "FADEmmss";
static fademask_t fm = {NULL,0,0,0,0,0}; static fademask_t fm = {NULL,0,0,0,0,0};
lumpnum_t lumpnum; lumpnum_t lumpnum;
UINT8 *lump, *mask; UINT8 *lump, *mask;
...@@ -107,7 +107,14 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) { ...@@ -107,7 +107,14 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) {
if (masknum > 99 || scrnnum > 99) if (masknum > 99 || scrnnum > 99)
goto freemask; goto freemask;
sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)masknum, (UINT16)scrnnum); // SRB2Kart: This suddenly triggers ERRORMODE now
//sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)masknum, (UINT16)scrnnum);
lumpname[4] = '0'+(masknum/10);
lumpname[5] = '0'+(masknum%10);
lumpname[6] = '0'+(scrnnum/10);
lumpname[7] = '0'+(scrnnum%10);
lumpnum = W_CheckNumForName(lumpname); lumpnum = W_CheckNumForName(lumpname);
if (lumpnum == LUMPERROR) if (lumpnum == LUMPERROR)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment