thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'skin-wads-again' into 'master'

Browse source 
So I don't know what a skin wad is... (closes #282)

Closes #282

See merge request STJr/SRB2Internal!449
This commit is contained in:
MascaraSnake 2019-11-11 11:22:30 -05:00
commit c7e6aedd53
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/r_things.c
View file

@ -400,10 +400,6 @@ void R_AddSpriteDefs(UINT16 wadnum)
start = W_CheckNumForNamePwad("S_START", wadnum, 0); start = W_CheckNumForNamePwad("S_START", wadnum, 0);
if (start == INT16_MAX) if (start == INT16_MAX)
start = W_CheckNumForNamePwad("SS_START", wadnum, 0); //deutex compatib. start = W_CheckNumForNamePwad("SS_START", wadnum, 0); //deutex compatib.
if (start == INT16_MAX)
start = 0; //let say S_START is lump 0
else
start++; // just after S_START
end = W_CheckNumForNamePwad("S_END",wadnum,start); end = W_CheckNumForNamePwad("S_END",wadnum,start);
if (end == INT16_MAX) if (end == INT16_MAX)
@ -417,9 +413,16 @@ void R_AddSpriteDefs(UINT16 wadnum)
return; return;
} }
// ignore skin wads (we don't want skin sprites interfering with vanilla sprites) if (start == INT16_MAX)
if (start == 0 && W_CheckNumForNamePwad("S_SKIN", wadnum, 0) != UINT16_MAX) {
return; // ignore skin wads (we don't want skin sprites interfering with vanilla sprites)
if (W_CheckNumForNamePwad("S_SKIN", wadnum, 0) != UINT16_MAX)
return;
start = 0; //let say S_START is lump 0
}
else
start++; // just after S_START
if (end == INT16_MAX) if (end == INT16_MAX)
{ {