From 3e663867b96fb403e7b71a8d611bd33025ef5834 Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 28 May 2023 19:27:25 +0100 Subject: [PATCH] Move skin->namehash set to conclusion of R_AddSkins loop just before numskins is incremented, as it's possible to have a default name for a skin that doesn't touch the hash codepath --- src/r_skins.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/r_skins.c b/src/r_skins.c index 432052db1..49d1bef7f 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -959,8 +959,6 @@ void R_AddSkins(UINT16 wadnum, boolean mainfile) Z_Free(value2); } - skin->namehash = quickncasehash(skin->name, SKINNAMESIZE); - // copy to hudname and fullname as a default. if (!realname) { @@ -1005,6 +1003,9 @@ next_token: HWR_AddPlayerModel(numskins); #endif + // Finally, conclude by setting up final properties. + skin->namehash = quickncasehash(skin->name, SKINNAMESIZE); + numskins++; } return;