stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-14 17:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only return skin string number if it existed

Browse source
This commit is contained in:
Sally Coolatta 2021-04-25 18:44:07 -04:00
parent 92107f28d5
commit 4bafd62271
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/m_cond.c
View file

@ -508,9 +508,14 @@ INT32 M_UnlockableSkinNum(unlockable_t *unlock)
if (unlock->stringVar && strcmp(unlock->stringVar, ""))
{
// Get the skin from the string.
return R_SkinAvailable(unlock->stringVar);
INT32 skinnum = R_SkinAvailable(unlock->stringVar);
if (skinnum != -1)
{
return skinnum;
}
}
else if (unlock->variable >= 0 && unlock->variable < numskins)
if (unlock->variable >= 0 && unlock->variable < numskins)
{
// Use the number directly.
return unlock->variable;
@ -532,9 +537,14 @@ INT32 M_EmblemSkinNum(emblem_t *emblem)
if (emblem->stringVar && strcmp(emblem->stringVar, ""))
{
// Get the skin from the string.
return R_SkinAvailable(emblem->stringVar);
INT32 skinnum = R_SkinAvailable(emblem->stringVar);
if (skinnum != -1)
{
return skinnum;
}
}
else if (emblem->var >= 0 && emblem->var < numskins)
if (emblem->var >= 0 && emblem->var < numskins)
{
// Use the number directly.
return emblem->var;