From a061d72a8d24876e3833a054c2d750ec01fd00a3 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 12 Oct 2026 15:12:03 +0200 Subject: [PATCH] simplify skin helper functions a bit --- src/hu_stuff.c | 5 ++++- src/m_menu.c | 2 +- src/r_draw.cpp | 41 ++++++++++------------------------------- src/r_skins.c | 22 ++++++++++++---------- src/r_skins.h | 2 +- 5 files changed, 28 insertions(+), 44 deletions(-) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 62665f332..2f8a1ef9c 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2654,9 +2654,12 @@ static inline void HU_DrawSpectatorTicker(void) if (player->mo && player->mo->color) { - const UINT8 *colormap = R_GetTranslationColormap(player->skin, player->mo->color, GTC_CACHE); + const UINT8 *colormap = NULL; + if (player->mo->colorized) colormap = R_GetTranslationColormap(TC_RAINBOW, player->mo->color, GTC_CACHE); + else + colormap = R_GetTranslationColormap(player->skin, player->mo->color, GTC_CACHE); if (K_UseHighResPortraits()) V_DrawSmallMappedPatch((templength - duptweak), height+10, V_TRANSLUCENT, R_GetSkinFaceWant(player), colormap); diff --git a/src/m_menu.c b/src/m_menu.c index 9a7866009..a9ca1edc0 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -9909,7 +9909,7 @@ static void M_DrawLocalSkinMenu(void) V_DrawFill(mx + 220 - (charw/2), my+54, charw, 84, 239); #undef charw - // FIXME: is skins[displayskin.localnum] even correct? + // FIXME: is using just "skins" array even correct? UINT8 *colormap = R_GetLocalTranslationColormap(skins[displayskin->skinnum], (displayskin->localskin ? localskins[displayskin->skinnum] : NULL), cv_playercolor.value, GTC_MENUCACHE, displayskin->localskin); V_DrawMappedPatch(mx, my+50, 0, (patch_t *)W_CachePatchName(displayskin->facewant, PU_PATCH), colormap); diff --git a/src/r_draw.cpp b/src/r_draw.cpp index a605cb01d..8670e0c37 100644 --- a/src/r_draw.cpp +++ b/src/r_draw.cpp @@ -441,47 +441,26 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags) UINT8* R_GetLocalTranslationColormap(skin_t *skin, skin_t *localskin, skincolors_t color, UINT8 flags, boolean local) { - const INT32 skinnum = (INT32)((localskin && local) ? localskin->skinnum : skin->skinnum); + const INT32 skinnum = (INT32)((localskin && local) ? localskin->skinnum : (skin != NULL ? skin->skinnum : 0)); return RGetTranslationColormap(skinnum, color, flags, (localskin && local)); } -patch_t* R_GetSkinFaceRank(player_t* ply) +patch_t* R_GetSkinFaceRank(player_t* player) { - if (ply->localskin) - { - if (ply->skinlocal) - return localskins[ply->localskin - 1]->facerankprefix; - - return skins[ply->localskin - 1]->facerankprefix; - } - - return skins[ply->skin]->facerankprefix; + const skin_t *skin = R_GetPlayerSkin(player); + return skin->facerankprefix; } -patch_t* R_GetSkinFaceWant(player_t* ply) +patch_t* R_GetSkinFaceWant(player_t* player) { - if (ply->localskin) - { - if (ply->skinlocal) - return localskins[ply->localskin - 1]->facewantprefix; - - return skins[ply->localskin - 1]->facewantprefix; - } - - return skins[ply->skin]->facewantprefix; + const skin_t *skin = R_GetPlayerSkin(player); + return skin->facewantprefix; } -patch_t* R_GetSkinFaceMini(player_t* ply) +patch_t* R_GetSkinFaceMini(player_t* player) { - if (ply->localskin) - { - if (ply->skinlocal) - return localskins[ply->localskin - 1]->facemmapprefix; - - return skins[ply->localskin - 1]->facemmapprefix; - } - - return skins[ply->skin]->facemmapprefix; + const skin_t *skin = R_GetPlayerSkin(player); + return skin->facemmapprefix; } /** \brief Flushes cache of translation colormaps. diff --git a/src/r_skins.c b/src/r_skins.c index 139fa156d..d3586f5a4 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -812,6 +812,8 @@ void R_AddSkins(UINT16 wadnum, boolean local) return; } +// Helper functions for skin stuff + // // returns the skin array to use // accounts for localskins @@ -821,15 +823,6 @@ skin_t **R_GetSkinArray(boolean local) return local ? localskins : skins; } -// -// returns the players skin -// accounts for localskins -// -skin_t *R_GetPlayerSkin(player_t *player) -{ - return R_GetSkinArray(player->skinlocal)[R_GetPlayerSkinNum(player)]; -} - // // returns the players skinnumber // accounts for localskins @@ -839,11 +832,20 @@ INT32 R_GetPlayerSkinNum(player_t *player) return player->localskin ? (player->localskin - 1) : player->skin; } +// +// returns the players skin +// accounts for localskins +// +skin_t *R_GetPlayerSkin(player_t *player) +{ + return R_GetSkinArray(player->skinlocal)[R_GetPlayerSkinNum(player)]; +} + // // returns the mobj skinnumber // accounts for localskins // -INT32 R_GetMobjLocalSkinNum(const mobj_t *mobj) +INT32 R_GetMobjSkinNum(const mobj_t *mobj) { return (mobj->localskin && mobj->skinlocal) ? mobj->localskin->skinnum : mobj->skin->skinnum; } diff --git a/src/r_skins.h b/src/r_skins.h index 25c9136d7..e2358a753 100644 --- a/src/r_skins.h +++ b/src/r_skins.h @@ -107,7 +107,7 @@ INT32 R_LocalSkinAvailable(const char *name, boolean local); skin_t **R_GetSkinArray(boolean local); skin_t *R_GetPlayerSkin(player_t *player); INT32 R_GetPlayerSkinNum(player_t *player); -INT32 R_GetMobjLocalSkinNum(const mobj_t *mobj); +INT32 R_GetMobjSkinNum(const mobj_t *mobj); skin_t *R_GetMobjSkin(const mobj_t *mobj); void sortSkinGrid(void);