From f255374a9d303601ff5cd271baf06e91807fd61a Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Apr 2025 06:54:22 +0200 Subject: [PATCH] skip checking skin array if localskin was found in localskin array --- src/lua_mobjlib.c | 5 ++--- src/r_things.c | 12 ++++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index b91c77379..ef4ddaa4d 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -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; } diff --git a/src/r_things.c b/src/r_things.c index 694732885..adc9dec62 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -3175,11 +3175,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; @@ -3189,9 +3189,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 @@ -3204,7 +3206,8 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar) player->mo->localskin = &skins[i]; player->mo->skinlocal = false; } - break; + + goto setcvar; } } } @@ -3219,6 +3222,7 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar) } } +setcvar: if (cvar != NULL) { if (player->localskin > 0)