skip checking skin array if localskin was found in localskin array

This commit is contained in:
Alug committed 2025-04-24 09:24:01 +02:00
1 parent f81488500c
commit cf92df5faa
2 files changed
+10 -7

No files matched your search

+2 -3
View File
@@ -452,7 +452,7 @@ int mobj_localskin_setter(lua_State *L)
strlcpy(skin, luaL_optstring(L, 2, "none"), sizeof skin);
strlwr(skin); // all skin names are lowercase
if (strcasecmp(skin, "none"))
if (stricmp(skin, "none"))
{
// Try localskins
for (i = 0; i < numlocalskins; i++)
@@ -468,7 +468,7 @@ int mobj_localskin_setter(lua_State *L)
// Try other skins
for (i = 0; i < numskins; i++)
{
if (fastcmp(skins[i].name, skin))
if (stricmp(skins[i].name, skin) == 0)
{
mo->localskin = &skins[i];
mo->skinlocal = false;
@@ -483,7 +483,6 @@ int mobj_localskin_setter(lua_State *L)
}
}
return 0;
}
+8 -4
View File
@@ -3163,11 +3163,11 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
INT32 i;
player_t *player = &players[playernum];
if (strcasecmp(skinname, "none"))
if (stricmp(skinname, "none"))
{
for (i = 0; i < numlocalskins; i++)
{
// search in the skin list
// search in the localskin list
if (stricmp(localskins[i].name, skinname) == 0)
{
player->localskin = 1 + i;
@@ -3177,9 +3177,11 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
player->mo->localskin = &localskins[i];
player->mo->skinlocal = true;
}
break;
goto setcvar;
}
}
for (i = 0; i < numskins; i++)
{
// search in the skin list
@@ -3192,7 +3194,8 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
player->mo->localskin = &skins[i];
player->mo->skinlocal = false;
}
break;
goto setcvar;
}
}
}
@@ -3207,6 +3210,7 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
}
}
setcvar:
if (cvar != NULL)
{
if (player->localskin > 0)