From 08d8bc7f58cfc740b02912802c54975ab1454009 Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 13 Aug 2025 10:14:09 +0100 Subject: [PATCH] Fix direct skin assignment in netsave + Heavy Magician Was not caught by compiler because these are void pointers :face_holding_back_tears: --- src/p_saveg.cpp | 2 +- src/r_skins.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index a3abaaa11..4065a4abf 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -4834,7 +4834,7 @@ static thinker_t* LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) if (diff2 & MD2_CVMEM) mobj->cvmem = READINT32(save->p); if (diff2 & MD2_SKIN) - mobj->skin = &skins[READUINT8(save->p)]; + mobj->skin = skins[READUINT8(save->p)]; if (diff2 & MD2_COLOR) mobj->color = READUINT16(save->p); if (diff2 & MD2_EXTVAL1) diff --git a/src/r_skins.c b/src/r_skins.c index 31b7a7729..553dd28f1 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -505,7 +505,7 @@ void SetFakePlayerSkin(player_t* player, INT32 skinid) player->charflags = skins[skinid]->flags; } - player->mo->skin = &skins[skinid]; + player->mo->skin = skins[skinid]; } // Loudly rerandomize