diff --git a/src/d_player.h b/src/d_player.h index 10a9cf3a9..c5dcb495a 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -35,9 +35,8 @@ // Extra abilities/settings for skins (combinable stuff) typedef enum { - SF_HIRES = 1, // Draw the sprite at different size? - SF_MACHINE = 1<<1, // Beep boop. Are you a robot? - SF_IRONMAN = 1<<2, // Pick a new skin during POSITION. I main Random! + SF_MACHINE = 1, // Beep boop. Are you a robot? + SF_IRONMAN = 1<<1, // Pick a new skin during POSITION. I main Random! // free up to and including 1<<31 } skinflags_t; diff --git a/src/deh_tables.c b/src/deh_tables.c index 63b076d30..4f0829415 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -6321,7 +6321,6 @@ struct int_const_s const INT_CONST[] = { {"CR_ZOOMTUBE",CR_ZOOMTUBE}, // Character flags (skinflags_t) - {"SF_HIRES",SF_HIRES}, {"SF_MACHINE",SF_MACHINE}, {"SF_IRONMAN",SF_IRONMAN}, diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 74385e7f7..32f46bda3 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5298,7 +5298,7 @@ static void HWR_ProjectSprite(mobj_t *thing) flip ^= (1<skin && ((skin_t *)thing->skin)->flags & SF_HIRES) + if (thing->skin && ((skin_t *)thing->skin)->highresscale != FRACUNIT) this_scale *= FIXED_TO_FLOAT(((skin_t *)thing->skin)->highresscale); spr_width = spritecachedinfo[lumpoff].width; diff --git a/src/k_menudraw.c b/src/k_menudraw.c index 92e47cb2f..5e20c0790 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -1178,7 +1178,7 @@ static boolean M_DrawCharacterSprite(INT16 x, INT16 y, INT16 skin, INT32 addflag if (sprframe->flip & 1) // Only for first sprite flags |= V_FLIP; // This sprite is left/right flipped! - if (skins[skin].flags & SF_HIRES) + if (skins[skin].highresscale != FRACUNIT) { V_DrawFixedPatch(x<stairjank--; } - + // Random skin / "ironman" if ((!P_MobjWasRemoved(player->mo)) && (skins[player->skin].flags & SF_IRONMAN)) // we are Heavy Magician with a mobj { diff --git a/src/r_skins.c b/src/r_skins.c index ec1eaf1cb..fe9007652 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -563,7 +563,6 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value) // parameters for individual character flags // these are uppercase so they can be concatenated with SF_ // 1, true, yes are all valid values - GETFLAG(HIRES) GETFLAG(MACHINE) GETFLAG(IRONMAN) #undef GETFLAG diff --git a/src/r_splats.c b/src/r_splats.c index 80ff44743..011e1d9eb 100644 --- a/src/r_splats.c +++ b/src/r_splats.c @@ -181,7 +181,7 @@ void R_DrawFloorSplat(vissprite_t *spr) splat.height = spr->patch->height; splat.scale = mobj->scale; - if (mobj->skin && ((skin_t *)mobj->skin)->flags & SF_HIRES) + if (mobj->skin && ((skin_t *)mobj->skin)->highresscale != FRACUNIT) splat.scale = FixedMul(splat.scale, ((skin_t *)mobj->skin)->highresscale); if (spr->rotateflags & SRF_3D || renderflags & RF_NOSPLATBILLBOARD) diff --git a/src/r_things.c b/src/r_things.c index 41dfc8585..d1398e9ea 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -945,7 +945,7 @@ static void R_DrawVisSprite(vissprite_t *vis) frac = vis->startfrac; windowtop = windowbottom = sprbotscreen = INT32_MAX; - if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && ((skin_t *)vis->mobj->skin)->flags & SF_HIRES) + if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && ((skin_t *)vis->mobj->skin)->highresscale != FRACUNIT) this_scale = FixedMul(this_scale, ((skin_t *)vis->mobj->skin)->highresscale); if (this_scale <= 0) @@ -1410,7 +1410,7 @@ static void R_ProjectDropShadow( shadow->gzt = groundz + patch->height * shadowyscale / 2; shadow->gz = shadow->gzt - patch->height * shadowyscale; shadow->texturemid = FixedMul(interp.scale, FixedDiv(shadow->gzt - viewz, shadowyscale)); - if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES) + if (thing->skin && ((skin_t *)thing->skin)->highresscale != FRACUNIT) shadow->texturemid = FixedMul(shadow->texturemid, ((skin_t *)thing->skin)->highresscale); shadow->scalestep = 0; shadow->shear.tan = shadowskew; // repurposed variable @@ -1797,7 +1797,7 @@ static void R_ProjectSprite(mobj_t *thing) I_Assert(lump < max_spritelumps); - if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES) + if (thing->skin && ((skin_t *)thing->skin)->highresscale != FRACUNIT) this_scale = FixedMul(this_scale, ((skin_t *)thing->skin)->highresscale); spr_width = spritecachedinfo[lump].width;