From 989f01d64405b63f95c431a2a55509d9808115f7 Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Sat, 31 May 2025 09:23:36 -0400
Subject: [PATCH] Kill SF_HIGHRES

---
 src/d_player.h         | 7 +++----
 src/deh_tables.c       | 1 -
 src/hardware/hw_main.c | 2 +-
 src/m_menu.c           | 2 +-
 src/r_skins.c          | 1 -
 src/r_splats.c         | 2 +-
 src/r_things.cpp       | 4 ++--
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index 98e9e2428..b3d6e3a8e 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -39,10 +39,9 @@ extern "C" {
 // 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_NOGIBS			= 1<<2, // Does this kart smash into pieces?
-	SF_OLDDEATH			= 1<<3, // Kart V1 styled death animation
+	SF_MACHINE          = 1, // Beep boop. Are you a robot?
+	SF_NOGIBS			= 1<<1, // Does this kart smash into pieces?
+	SF_OLDDEATH			= 1<<2, // Kart V1 styled death animation
 	// free up to and including 1<<31
 } skinflags_t;
 
diff --git a/src/deh_tables.c b/src/deh_tables.c
index 0b0bd6c8e..21efdc21b 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -1018,7 +1018,6 @@ struct int_const_s const INT_CONST[] = {
 	{"CR_ZOOMTUBE",CR_ZOOMTUBE},
 
 	// Character flags (skinflags_t)
-	{"SF_HIRES",SF_HIRES},
 	{"SF_MACHINE",SF_MACHINE},
 
 	// Sound flags
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 9b62dc3c0..71732222a 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -4954,7 +4954,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
 			flip ^= (1<<rot);
 	}
 
-	if (thing->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/m_menu.c b/src/m_menu.c
index 90bb67731..1b6cb89b8 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -7408,7 +7408,7 @@ void M_DrawSetupMultiPlayerMenu(void)
 	{
 		UINT8 *colormap = R_GetTranslationColormap(setupm_fakeskin, setupm_fakecolor->color, GTC_MENUCACHE);
 
-		if (skins[setupm_fakeskin].flags & SF_HIRES)
+		if (skins[setupm_fakeskin].highresscale != FRACUNIT)
 		{
 			V_DrawFixedPatch((mx+43)<<FRACBITS,
 						(my+131)<<FRACBITS,
diff --git a/src/r_skins.c b/src/r_skins.c
index 0571a06c4..16b479643 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -623,7 +623,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(NOGIBS)
 	GETFLAG(OLDDEATH)
diff --git a/src/r_splats.c b/src/r_splats.c
index de7b2bf26..d364e9dc6 100644
--- a/src/r_splats.c
+++ b/src/r_splats.c
@@ -169,7 +169,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.cpp b/src/r_things.cpp
index 03ba7feca..ec3a927f3 100644
--- a/src/r_things.cpp
+++ b/src/r_things.cpp
@@ -1516,7 +1516,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
@@ -1914,7 +1914,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;