From 2959a84b74e096c5e9b25fb0fbb08d3e28dbed5e Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 11 Apr 2025 20:45:46 +0200 Subject: [PATCH] attempt at unmangling localskin stuff again moved almost all the weird ass ternaries into functions and should also probably fix some remaining issues where stuff was wrong --- src/hardware/hw_main.c | 12 +++--- src/hardware/hw_md2.c | 16 ++++---- src/k_kart.c | 85 +++++++++++++++++++++++++++++------------- src/lua_mobjlib.c | 22 +++++------ src/lua_playerlib.c | 2 +- src/lua_script.c | 1 + src/p_local.h | 1 - src/p_user.c | 29 +++++--------- src/r_draw.c | 10 ++--- src/r_things.c | 33 +++++++--------- src/r_things.h | 10 ++++- src/s_sound.c | 2 +- src/y_inter.c | 22 +++++------ 13 files changed, 136 insertions(+), 109 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index b15e1bbd9..93054e3f0 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -3318,11 +3318,11 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, GLPatch_t *gpatch) float offset = 0; // technically this_scale gets multiplied and added to sprite y/x scale, but this thing needs it for some crap so ill just throw it in here again - const boolean hires = (spr->mobj && spr->mobj->skin && ((skin_t *)( (spr->mobj->localskin) ? spr->mobj->localskin : spr->mobj->skin ))->flags & SF_HIRES); + const boolean hires = (spr->mobj && spr->mobj->skin && K_GetMobjSkin(thing)->flags & SF_HIRES); if (spr->mobj) this_scale = FIXED_TO_FLOAT(spr->mobj->scale); if (hires) - this_scale = this_scale * FIXED_TO_FLOAT(((skin_t *)( (spr->mobj->localskin) ? spr->mobj->localskin : spr->mobj->skin ))->highresscale); + this_scale = this_scale * FIXED_TO_FLOAT(K_GetMobjSkin(thing)->highresscale); R_GetShadowZ(spr->mobj, &floorslope); @@ -4660,9 +4660,9 @@ static void HWR_ProjectSprite(mobj_t *thing) //Fab : 02-08-98: 'skin' override spritedef currently used for skin if ((thing->skin || thing->localskin) && thing->sprite == SPR_PLAY) { - sprdef = &((skin_t *)( (thing->localskin) ? thing->localskin : thing->skin ))->spritedef; + sprdef = &K_GetMobjSkin(thing)->spritedef; #ifdef ROTSPRITE - sprinfo = &((skin_t *)( (thing->localskin) ? thing->localskin : thing->skin ))->sprinfo; + sprinfo = &K_GetMobjSkin(thing)->sprinfo; #endif } else @@ -4741,8 +4741,8 @@ static void HWR_ProjectSprite(mobj_t *thing) flip ^= (1<skin && ((skin_t *)(thing->localskin ? thing->localskin : thing->skin))->flags & SF_HIRES) - this_scale *= FIXED_TO_FLOAT(((skin_t *)(thing->localskin ? thing->localskin : thing->skin))->highresscale); + if ((thing->skin || thing->localskin) && K_GetMobjSkin(thing)->flags & SF_HIRES) + this_scale *= FIXED_TO_FLOAT(K_GetMobjSkin(thing)->highresscale); spr_width = spritecachedinfo[lumpoff].width; spr_height = spritecachedinfo[lumpoff].height; diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index cefbde5b7..f109ddd41 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -403,7 +403,7 @@ static void md2_loadTexture(md2_t *model) glpatch->height = (INT16)h; glpatch->mipmap->width = (UINT16)w; glpatch->mipmap->height = (UINT16)h; - + // for palette rendering, color cube is applied in post-processing instead of here if (!HWR_ShouldUsePaletteRendering()) { @@ -607,7 +607,7 @@ void HWR_AddPlayerMD2(int skin, boolean local) // For MD2's that were added afte // Check for any MD2s that match the names of player skins! while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4) { - if (stricmp(name, ( (local) ? localskins : skins )[skin].name) == 0) + if (stricmp(name, K_GetSkinArray(local)[skin].name) == 0) { md2s[skin].skin = skin; md2s[skin].scale = scale; @@ -1179,13 +1179,13 @@ void HWR_DrawMD2(gl_vissprite_t *spr) // Apparently people don't like jump frames like that, so back it goes //if (tics > durs) //durs = tics; - + INT32 blendmode; if (spr->mobj->frame & FF_BLENDMASK) blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1; else blendmode = spr->mobj->blendmode; - + blendmode = min(AST_MODULATE, blendmode); if (spr->mobj->flags2 & MF2_SHADOW) @@ -1207,7 +1207,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) // dont forget to enabled the depth test because we can't do this like // before: polygons models are not sorted - + /* fuck you */ if (spr->mobj->localskin) { @@ -1298,7 +1298,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) tcskinnum = TC_RAINBOW; else { - tcskinnum = (INT32)((skin_t*)( (spr->mobj->localskin) ? spr->mobj->localskin : spr->mobj->skin ) - ( (spr->mobj->skinlocal) ? localskins : skins )); + tcskinnum = (INT32)(K_GetMobjSkinNum(K_GetMobjSkin(spr->mobj), spr->mobj->skinlocal)); } } else tcskinnum = TC_DEFAULT; @@ -1364,8 +1364,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr) else p.z = FIXED_TO_FLOAT(interp.z); - if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY) - sprdef = &((skin_t *)( (spr->mobj->localskin) ? spr->mobj->localskin : spr->mobj->skin ))->spritedef; + if ((spr->mobj->skin || spr->mobj->localskin) && spr->mobj->sprite == SPR_PLAY) + sprdef = &K_GetMobjSkin(spr->mobj)->spritedef; else sprdef = &sprites[spr->mobj->sprite]; diff --git a/src/k_kart.c b/src/k_kart.c index 248c7235d..500eb4eaa 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -696,7 +696,7 @@ void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, bo return; } - starttranscolor = (skinnum != TC_DEFAULT) ? ((local) ? localskins : skins)[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR; + starttranscolor = (skinnum != TC_DEFAULT) ? K_GetSkinArray(local)[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR; // Fill in the entries of the palette that are fixed for (i = 0; i < starttranscolor; i++) @@ -778,6 +778,51 @@ boolean K_UseHighResPortraits(void) return (cv_highresportrait.value && K_IsHighResolution()); } +// returns the players skinnumber +// accounts for localskins +INT32 K_GetSkinNum(player_t *player) +{ + return player->localskin ? (player->localskin - 1) : player->skin; +} + +// returns the mobj skinnumber +// accounts for localskins +INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local) +{ + return skin - K_GetSkinArray(local); +} + +// returns the players skinnumber +// accounts for localskins +skin_t *K_GetMobjSkin(const mobj_t *mobj) +{ + return mobj->localskin ? mobj->localskin : mobj->skin; +} + +// returns the skin array to use +// accounts for localskins +skin_t *K_GetSkinArray(boolean local) +{ + return local ? localskins : skins; +} + +// returns the players skin +// accounts for localskins +skin_t *K_GetPlayerSkin(player_t *player) +{ + return &K_GetSkinArray(player->skinlocal)[K_GetSkinNum(player)]; +} + +// returns the players faceprefix +// accounts for localskins +patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum) +{ + if (!player->skinlocal) + return (K_UseHighResPortraits() ? facewantprefix[skinnum] : facerankprefix[skinnum]); + else + return (K_UseHighResPortraits() ? localfacewantprefix[skinnum] : localfacerankprefix[skinnum]); +} + //} //{ SRB2kart Net Variables @@ -2109,8 +2154,7 @@ static void K_PlayGenericCombatSound(mobj_t *source, mobj_t *other, sfxenum_t sf // I HATE LOCALSKINS! I HATE LOCALSKINS! :AAAAAAAAAA: if (source->player) { - INT32 skinnum = source->player->skinlocal ? (source->player->localskin - 1) : source->player->skin; - skin = &(source->player->skinlocal ? localskins : skins)[skinnum]; + skin = K_GetPlayerSkin(source->player); } if (!skin) @@ -8388,16 +8432,7 @@ static void K_drawKartStats(void) flags |= V_HUDTRANS; skin_t *fakeskin; - fakeskin = &skins[stplyr->skin]; - - // local skinner - if (stplyr->localskin) - { - if (stplyr->skinlocal) - fakeskin = &localskins[stplyr->localskin - 1]; - else - fakeskin = &skins[stplyr->localskin - 1]; - } + fakeskin = K_GetPlayerSkin(stplyr); if (!splitscreen) { @@ -10276,9 +10311,9 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) // am xpos & ypos are the icon's starting position. Without // it, they wouldn't 'spawn' on the top-right side of the HUD. - UINT8 skinnum = 0; + const skin_t *skin; + player_t *player = mo->player; const boolean skinlocal = mo->skinlocal; - const skin_t *skin = (skin_t*)(mo->localskin ? mo->localskin : mo->skin); fixed_t amnumxpos, amnumypos; INT32 amxpos, amypos, wntdamxpos, wntdamypos; @@ -10290,10 +10325,8 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) INT32 rot = 0; #endif - if (mo->skin) - skinnum = (skin-(skinlocal ? localskins : skins)); - - minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[skinnum]; + skin = K_GetMobjSkin(mo); + minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)]; amnumxpos = (FixedMul(lerp(mo->old_x, mo->x), minimapinfo.zoom) - minimapinfo.offs_x); amnumypos = -(FixedMul(lerp(mo->old_y, mo->y), minimapinfo.zoom) - minimapinfo.offs_y); @@ -10304,9 +10337,9 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) amxpos = amnumxpos + ((x + (SHORT(minimapinfo.minimap_pic->width)-SHORT(minimaphead->width)) / 2)<height)-SHORT(minimaphead->height)) / 2)<player && !(modeattacking || gamestate == GS_TIMEATTACK)) + if (cv_showminimapnames.value && player && !(modeattacking || gamestate == GS_TIMEATTACK)) { - V_DrawCenteredSmallStringAtFixed(amxpos + (4*FRACUNIT), amypos - (3*FRACUNIT), V_ALLOWLOWERCASE|flags|V_SkinColorToHighlightcolor(mo->color), player_names[mo->player - players]); + V_DrawCenteredSmallStringAtFixed(amxpos + (4*FRACUNIT), amypos - (3*FRACUNIT), V_ALLOWLOWERCASE|flags|V_SkinColorToHighlightcolor(mo->color), player_names[player - players]); } // thx wanted reticle for having weird offsets very cool @@ -10321,10 +10354,10 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) } #ifdef ROTSPRITE - if (cv_spinoutroll.value && mo->player && mo->player->spinoutrot) + if (cv_spinoutroll.value && player && player->spinoutrot) { // Rotate counterclockwise. - rollangle = FixedAngle(mo->player->spinoutrot * -1); + rollangle = FixedAngle(player->spinoutrot * -1); rot = R_GetRollAngle(rollangle); if (rot) @@ -10347,9 +10380,9 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) V_DrawFixedPatch(amxpos, amypos, scale, flags, minimaphead, colormap); - if (mo->player - && ((G_RaceGametype() && mo->player->kartstuff[k_position] == spbplace) - || (G_BattleGametype() && K_IsPlayerWanted(mo->player)))) + if (player + && ((G_RaceGametype() && player->kartstuff[k_position] == spbplace) + || (G_BattleGametype() && K_IsPlayerWanted(player)))) { V_DrawFixedPatch(wntdamxpos, wntdamypos, scale, flags, kp_wantedreticle, NULL); } diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index 978f75d01..9498974d5 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -392,16 +392,16 @@ int mobj_skin_getter(lua_State *L) mobj_t *mo = GETMO(); if (!mo->skin) - return 0; + return 0; + + // HUD ONLY!!!!!!!!!! + if (hud_running && cv_luaimmersion.value) + { + lua_pushstring(L, K_GetMobjSkin(mo)->name); + } + else + lua_pushstring(L, ((skin_t *)mo->skin)->name); - if (hud_running && cv_luaimmersion.value) { - if (mo->localskin) // HUD ONLY!!!!!!!!!! - lua_pushstring(L, ((skin_t *)mo->localskin)->name); - else - lua_pushstring(L, ((skin_t *)mo->skin)->name); - } else { - lua_pushstring(L, ((skin_t *)mo->skin)->name); - } return 1; } @@ -502,12 +502,12 @@ int mobj_color_setter(lua_State *L) int mobj_blendmode_setter(lua_State *L) { mobj_t *mo = GETMO(); - + INT32 blendmode = (INT32)luaL_checkinteger(L, 2); if (blendmode < 0 || blendmode > AST_OVERLAY) return luaL_error(L, "mobj.blendmode %d out of range (0 - %d).", blendmode, AST_OVERLAY); mo->blendmode = blendmode; - + return 0; } diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index 32b4abfe7..849f42b39 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -295,7 +295,7 @@ int player_localskin_getter(lua_State *L) player_t *plr = GETPLAYER(); if (plr->localskin) - lua_pushstring(L, (plr->skinlocal ? localskins : skins)[plr->localskin - 1].name); + lua_pushstring(L, K_GetPlayerSkin(plr)->name); else lua_pushnil(L); diff --git a/src/lua_script.c b/src/lua_script.c index 4346e483e..580b83ae2 100644 --- a/src/lua_script.c +++ b/src/lua_script.c @@ -749,6 +749,7 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex) } lua_pop(gL, 1); } + if (!found) { t++; diff --git a/src/p_local.h b/src/p_local.h index 9ac7a063c..76506ac87 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -237,7 +237,6 @@ void P_PlayRinglossSound(mobj_t *source, mobj_t *damager); void P_PlayDeathSound(mobj_t *source); void P_PlayVictorySound(mobj_t *source); - // // P_MOBJ // diff --git a/src/p_user.c b/src/p_user.c index 5d91a1e32..1747a84a1 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -557,14 +557,9 @@ void P_PlayRinglossSound(mobj_t *source, mobj_t *damager) { sfxenum_t sfx = sfx_khurt1 + key; - INT32 skinnum = -1; - // I HATE LOCALSKINS! I HATE LOCALSKINS! :AAAAAAAAAA: if (source->player) - skinnum = source->player->skinlocal ? (source->player->localskin - 1) : source->player->skin; - - if (skinnum >= 0) - sfx = (source->player->skinlocal ? localskins : skins)[skinnum].soundsid[SKSKPAN1 + key]; + sfx = K_GetPlayerSkin(source->player)->soundsid[SKSKPAN1 + key]; S_StartSound(NULL, sfx); } @@ -1195,9 +1190,9 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->tics = -1; ghost->frame &= ~FF_TRANSMASK; ghost->frame |= tr_trans50<slopepitch = mobj->slopepitch; + ghost->slopepitch = mobj->slopepitch; ghost->sloperoll = mobj->sloperoll; - + ghost->fuse = ghost->info->damage; ghost->skin = mobj->skin; ghost->localskin = mobj->localskin; @@ -1254,17 +1249,13 @@ void P_DoPlayerExit(player_t *player) { sfxenum_t sfx_id; // fix godjjsa win sounds - if (K_IsPlayerLosing(player)) { - if (player->mo->localskin) - sfx_id = ((skin_t *)player->mo->localskin)->soundsid[S_sfx[sfx_klose].skinsound]; - else - sfx_id = ((skin_t *)player->mo->skin)->soundsid[S_sfx[sfx_klose].skinsound]; + if (K_IsPlayerLosing(player)) + { + sfx_id = K_GetMobjSkin(player->mo)->soundsid[S_sfx[sfx_klose].skinsound]; } - else { - if (player->mo->localskin) - sfx_id = ((skin_t *)player->mo->localskin)->soundsid[S_sfx[sfx_kwin].skinsound]; - else - sfx_id = ((skin_t *)player->mo->skin)->soundsid[S_sfx[sfx_kwin].skinsound]; + else + { + sfx_id = K_GetMobjSkin(player->mo)->soundsid[S_sfx[sfx_kwin].skinsound]; } S_StartSound(NULL, sfx_id); } @@ -4715,7 +4706,7 @@ void P_PlayerThink(player_t *player) continue; break; } - + if (i < MAXPLAYERS && !player->spectator && !player->exiting && !(player->pflags & PF_TIMEOVER)) { const tic_t griefval = cv_antigrief.value * TICRATE; diff --git a/src/r_draw.c b/src/r_draw.c index b91ffa918..e709c625b 100644 --- a/src/r_draw.c +++ b/src/r_draw.c @@ -484,12 +484,12 @@ 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) { if (localskin) - return RGetTranslationColormap(( localskin - ( (local) ? localskins : skins ) ), color, flags, local); + return RGetTranslationColormap(localskin - K_GetSkinArray(local), color, flags, local); else - return RGetTranslationColormap(( skin - skins ), color, flags, false); + return RGetTranslationColormap((skin - skins), color, flags, false); } -patch_t* R_GetSkinFaceRank(player_t* ply) +patch_t* R_GetSkinFaceRank(player_t* ply) { if (ply->skinlocal && ply->localskin) return localfacerankprefix[ply->localskin - 1]; @@ -498,7 +498,7 @@ patch_t* R_GetSkinFaceRank(player_t* ply) return facerankprefix[ply->skin]; } -patch_t* R_GetSkinFaceWant(player_t* ply) +patch_t* R_GetSkinFaceWant(player_t* ply) { if (ply->skinlocal && ply->localskin) return localfacewantprefix[ply->localskin - 1]; @@ -507,7 +507,7 @@ patch_t* R_GetSkinFaceWant(player_t* ply) return facewantprefix[ply->skin]; } -patch_t* R_GetSkinFaceMini(player_t* ply) +patch_t* R_GetSkinFaceMini(player_t* ply) { if (ply->skinlocal && ply->localskin) return localfacemmapprefix[ply->localskin - 1]; diff --git a/src/r_things.c b/src/r_things.c index a3d8b500f..1be7bb7c3 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -823,10 +823,8 @@ static void R_DrawVisSprite(vissprite_t *vis) frac = vis->startfrac; windowtop = windowbottom = sprbotscreen = INT32_MAX; - if (vis->mobj->localskin && ((skin_t *)vis->mobj->localskin)->flags & SF_HIRES) - this_scale = FixedMul(this_scale, ((skin_t *)vis->mobj->localskin)->highresscale); - else if (vis->mobj->skin && ((skin_t *)vis->mobj->skin)->flags & SF_HIRES) - this_scale = FixedMul(this_scale, ((skin_t *)vis->mobj->skin)->highresscale); + if ((vis->mobj->skin || vis->mobj->localskin) && K_GetMobjSkin(vis->mobj)->flags & SF_HIRES) + this_scale = FixedMul(this_scale, K_GetMobjSkin(vis->mobj)->highresscale); if (this_scale <= 0) this_scale = 1; @@ -1274,9 +1272,9 @@ static void R_ProjectSprite(mobj_t *thing) //Fab : 02-08-98: 'skin' override spritedef currently used for skin if ((thing->skin || thing->localskin) && thing->sprite == SPR_PLAY) { - sprdef = &((skin_t *)( (thing->localskin) ? thing->localskin : thing->skin ))->spritedef; + sprdef = &K_GetMobjSkin(thing)->spritedef; #ifdef ROTSPRITE - sprinfo = &((skin_t *)( (thing->localskin) ? thing->localskin : thing->skin ))->sprinfo; + sprinfo = &K_GetMobjSkin(thing)->sprinfo; #endif if (rot >= sprdef->numframes) @@ -1357,10 +1355,8 @@ static void R_ProjectSprite(mobj_t *thing) I_Assert(lump < max_spritelumps); - if (thing->localskin && ((skin_t *)thing->localskin)->flags & SF_HIRES) - this_scale = FixedMul(this_scale, ((skin_t *)thing->localskin)->highresscale); - else if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES) - this_scale = FixedMul(this_scale, ((skin_t *)thing->skin)->highresscale); + if ((thing->skin || thing->localskin) && K_GetMobjSkin(thing)->flags & SF_HIRES) + this_scale = FixedMul(this_scale, K_GetMobjSkin(thing)->highresscale); spr_width = spritecachedinfo[lump].width; spr_height = spritecachedinfo[lump].height; @@ -3022,8 +3018,7 @@ static void Sk_SetDefaultValue(skin_t *skin, boolean local) // set default skin values // memset(skin, 0, sizeof (skin_t)); - snprintf(skin->name, - sizeof skin->name, "skin %u", (UINT32)(skin-(local ? localskins : skins))); + snprintf(skin->name, sizeof skin->name, "skin %u", K_GetMobjSkinNum(skin, local)); skin->name[sizeof skin->name - 1] = '\0'; skin->wadnum = INT16_MAX; strcpy(skin->sprite, ""); @@ -3244,8 +3239,9 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar) { if (player->localskin > 0) { - CV_StealthSet(&cv_fakelocalskin, (player->skinlocal ? localskins : skins)[player->localskin-1].name); - CV_StealthSet(cvar, (player->skinlocal ? localskins : skins)[player->localskin-1].name); + CV_StealthSet(&cv_fakelocalskin, K_GetSkinArray(player->skinlocal)[player->localskin-1].name); + CV_StealthSet(cvar, K_GetSkinArray(player->skinlocal)[player->localskin-1].name); + } else { @@ -3434,7 +3430,6 @@ void R_AddSkins(UINT16 wadnum, boolean local) skin_t *skin; boolean hudname, realname; -#define lskin (local ? localskins : skins) #define lnumskins (local ? numlocalskins : numskins) // @@ -3468,7 +3463,7 @@ void R_AddSkins(UINT16 wadnum, boolean local) buf2[size] = '\0'; // set defaults - skin = &lskin[lnumskins]; + skin = &K_GetSkinArray(local)[lnumskins]; Sk_SetDefaultValue(skin, local); skin->wadnum = wadnum; hudname = realname = false; @@ -3503,10 +3498,10 @@ void R_AddSkins(UINT16 wadnum, boolean local) else { const size_t stringspace = - strlen(value) + sizeof (( (local) ? numlocalskins : numskins )) + 1; + strlen(value) + sizeof lnumskins + 1; char *value2 = Z_Malloc(stringspace, PU_STATIC, NULL); snprintf(value2, stringspace, - "%s%d", value, ( (local) ? numlocalskins : numskins )); + "%s%d", value, lnumskins); value2[stringspace - 1] = '\0'; if (R_LocalSkinAvailable(value2, local) == -1) { @@ -3727,7 +3722,7 @@ next_token: skinsorted[numskins] = numskins; } - allskins[numallskins] = lskin[lnumskins]; + allskins[numallskins] = K_GetSkinArray(local)[lnumskins]; local ? numlocalskins++ : numskins++; numallskins++; diff --git a/src/r_things.h b/src/r_things.h index 1db265f4b..fe4f532b6 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -118,13 +118,21 @@ typedef struct // specific sounds per skin sfxenum_t soundsid[NUMSKINSOUNDS]; // sound # in S_sfx table - + boolean localskin; INT32 localnum; } skin_t; extern CV_PossibleValue_t Forceskin_cons_t[]; +// had to move those here Zzz... +INT32 K_GetSkinNum(player_t *player); +INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local); +skin_t *K_GetPlayerSkin(player_t *player); +skin_t *K_GetMobjSkin(const mobj_t *mobj); +patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum); +skin_t *K_GetSkinArray(boolean local); + // ----------- // NOT SKINS STUFF ! // ----------- diff --git a/src/s_sound.c b/src/s_sound.c index fc77fdacf..9db004a44 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -509,7 +509,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume) if (sfx->skinsound != -1 && origin && origin->skin) { // redirect player sound to the sound in the skin table - sfx_id = ((skin_t *)( (origin->localskin) ? origin->localskin : origin->skin ))->soundsid[sfx->skinsound]; + sfx_id = K_GetMobjSkin(origin)->soundsid[sfx->skinsound]; sfx = &S_sfx[sfx_id]; } diff --git a/src/y_inter.c b/src/y_inter.c index 01611e568..444df52d4 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -409,12 +409,7 @@ static void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 x, INT32 hilicol) { UINT8 *colormap = R_GetTranslationColormap(*standings->character[i], *standings->color[i], GTC_CACHE); INT32 skinnum = (player->localskin ? (player->localskin - 1) : *standings->character[i]); - patch_t *faceprefix = NULL; - - if (!player->skinlocal) - faceprefix = (K_UseHighResPortraits() ? facewantprefix[skinnum] : facerankprefix[skinnum]); - else - faceprefix = (K_UseHighResPortraits() ? localfacewantprefix[skinnum] : localfacerankprefix[skinnum]); + patch_t *faceprefix = K_GetFacePrefix(player, skinnum); if (K_UseHighResPortraits()) V_DrawSmallMappedPatch(x + 16, y - 4, 0, faceprefix, colormap); @@ -1143,7 +1138,9 @@ void Y_VoteDrawer(void) if (dedicated && i == 0) // While leaving blank spots for non-existent players is largely intentional, the first spot *always* being blank looks a tad silly :V continue; - if ((playeringame[i] && !players[i].spectator) && votes[i] != -1) + player_t *player = &players[i]; + + if ((playeringame[i] && !player->spectator) && votes[i] != -1) { patch_t *pic; @@ -1175,13 +1172,16 @@ void Y_VoteDrawer(void) V_DrawDiag(x, y, 6, V_SNAPTOLEFT|levelinfo[votes[i]].gtc); } - if (players[i].skincolor) + if (player->skincolor) { - UINT8 *colormap = R_GetTranslationColormap(players[i].skin, players[i].skincolor, GTC_CACHE); + UINT8 *colormap = R_GetTranslationColormap(player->skin, player->skincolor, GTC_CACHE); + + patch_t *faceprefix = K_GetFacePrefix(player, K_GetSkinNum(player)); + if (K_UseHighResPortraits()) - V_DrawSmallMappedPatch(x+24, y+9, V_SNAPTOLEFT, (players[i].skinlocal ? localfacewantprefix : facewantprefix)[((players[i].localskin) ? players[i].localskin-1 : players[i].skin)], colormap); + V_DrawSmallMappedPatch(x+24, y+9, V_SNAPTOLEFT, faceprefix, colormap); else - V_DrawMappedPatch(x+24, y+9, V_SNAPTOLEFT, (players[i].skinlocal ? localfacerankprefix : facerankprefix)[((players[i].localskin) ? players[i].localskin-1 : players[i].skin)], colormap); + V_DrawMappedPatch(x+24, y+9, V_SNAPTOLEFT, faceprefix, colormap); } if (!splitscreen && i == consoleplayer)