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

The problem was triplefold!

Browse source 
* Value was getting populated even when it was irrelevant. That's fine, just move it after the valueless parsemode switch.
* Oh, it's struppr'd, of course it's going to compare badly with a lowercase string.
* ...oh, strncmp returns zero when it's equal, not true. Right.

<root>/toaster/smilespatch.wad and !LSF test exe updated on the FTP, btw.
This commit is contained in:
toasterbabe 2017-01-17 13:22:27 +00:00
parent 30b0d8af57
commit 5138255b94
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/r_things.c
View file

@ -2974,8 +2974,6 @@ void R_PatchSkins(UINT16 wadnum)
goto next_token; // find the real next token
}
value = strtok(NULL, "\r\n= ");
switch (parsemode) // This is where additional keyword-only tokens may be considered.
{
case PATCHPARSE_GET_NAME: // No keyword-only properties.
@ -2990,7 +2988,7 @@ void R_PatchSkins(UINT16 wadnum)
case PATCHPARSE_REMOVE_SPR2: // Following a "reset" command.
{
strupr(stoken);
if (strncmp(stoken, "spr2_", 5))
if (!strncmp(stoken, "SPR2_", 5))
{
UINT8 i;
for (i = 0; i < (UINT8)free_spr2; i++)
@ -3044,6 +3042,8 @@ void R_PatchSkins(UINT16 wadnum)
break;
}
value = strtok(NULL, "\r\n= ");
if (!value)
I_Error("R_PatchSkins: syntax error in P_SKIN lump# %d(%s) in WAD %s\n", lump, W_CheckNameForNumPwad(wadnum,lump), wadfiles[wadnum]->filename);
@ -3067,7 +3067,7 @@ void R_PatchSkins(UINT16 wadnum)
}
case PATCHPARSE_MODIFY_PROPERTY: // No value-requiring properties available for modification yet.
break;
case PATCHPARSE_REMOVE_SPR2: // Sprite2 reset should probably not include property unless you have a REALLY good idea.
case PATCHPARSE_REMOVE_SPR2: // Sprite2 reset should probably not include property.
break;
default: // ???
break;