From 2e5230820e8b3c92694018dd5ff69245f17d3a15 Mon Sep 17 00:00:00 2001
From: NepDisk <16447892+NepDisk@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:12:34 -0400
Subject: [PATCH] Remove unused shrink/grow item scale values

---
 src/d_player.h |  5 -----
 src/k_kart.c   | 21 ---------------------
 2 files changed, 26 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index eaacff21b..e1a5e9f33 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -261,10 +261,6 @@ typedef enum
 // for kickstartaccel
 #define ACCEL_KICKSTART (TICRATE)
 
-#define ITEMSCALE_NORMAL 0
-#define ITEMSCALE_GROW 1
-#define ITEMSCALE_SHRINK 2
-
 // player_t struct for all respawn variables
 typedef struct respawnvars_s
 {
@@ -444,7 +440,6 @@ typedef struct player_s
 	SINT8 itemtype;		// KITEM_ constant for item number
 	UINT8 itemamount;	// Amount of said item
 	SINT8 throwdir; 	// Held dir of controls; 1 = forward, 0 = none, -1 = backward (was "player->heldDir")
-	UINT8 itemscale;	// Item scale value, from when an item was taken out. (0 for normal, 1 for grow, 2 for shrink.)
 
 	UINT8 sadtimer;		// How long you've been sad
 
diff --git a/src/k_kart.c b/src/k_kart.c
index 6c65b9ea8..6f97f49de 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8050,25 +8050,11 @@ static void K_AdjustPlayerFriction(player_t *player)
 void K_SetItemOut(player_t *player)
 {
 	player->pflags |= PF_ITEMOUT;
-
-	if (player->mo->scale >= FixedMul(GROW_SCALE, mapobjectscale))
-	{
-		player->itemscale = ITEMSCALE_GROW;
-	}
-	else if (player->mo->scale <= FixedMul(SHRINK_SCALE, mapobjectscale))
-	{
-		player->itemscale = ITEMSCALE_SHRINK;
-	}
-	else
-	{
-		player->itemscale = ITEMSCALE_NORMAL;
-	}
 }
 
 void K_UnsetItemOut(player_t *player)
 {
 	player->pflags &= ~PF_ITEMOUT;
-	player->itemscale = ITEMSCALE_NORMAL;
 	player->bananadrag = 0;
 }
 
@@ -8268,7 +8254,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 									mo->threshold = 10;
 									mo->movecount = player->itemamount;
 									mo->movedir = moloop+1;
-									mo->cusval = player->itemscale;
 									P_SetTarget(&mo->target, player->mo);
 									P_SetTarget(&mo->hprev, prev);
 									P_SetTarget(&prev->hnext, mo);
@@ -8298,7 +8283,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 									mo->threshold = 10;
 									mo->movecount = 1;
 									mo->movedir = 1;
-									mo->cusval = player->itemscale;
 									P_SetTarget(&mo->target, player->mo);
 									P_SetTarget(&player->mo->hnext, mo);
 								}
@@ -8331,7 +8315,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 									mo->movecount = player->itemamount;
 									mo->movedir = mo->lastlook = moloop+1;
 									mo->color = player->skincolor;
-									mo->cusval = player->itemscale;
 									P_SetTarget(&mo->target, player->mo);
 									P_SetTarget(&mo->hprev, prev);
 									P_SetTarget(&prev->hnext, mo);
@@ -8372,7 +8355,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 									mo->threshold = 10;
 									mo->movecount = player->itemamount;
 									mo->movedir = mo->lastlook = moloop+1;
-									mo->cusval = player->itemscale;
 									P_SetTarget(&mo->target, player->mo);
 									P_SetTarget(&mo->hprev, prev);
 									P_SetTarget(&prev->hnext, mo);
@@ -8403,7 +8385,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 									mo->threshold = 10;
 									mo->movecount = 1;
 									mo->movedir = 1;
-									mo->cusval = player->itemscale;
 									P_SetTarget(&mo->target, player->mo);
 									P_SetTarget(&player->mo->hnext, mo);
 								}
@@ -8438,7 +8419,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 									mo->threshold = 10;
 									mo->movecount = 1;
 									mo->movedir = 1;
-									mo->cusval = player->itemscale;
 									P_SetTarget(&mo->target, player->mo);
 									P_SetTarget(&player->mo->hnext, mo);
 								}
@@ -8710,7 +8690,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 									mo->threshold = 10;
 									mo->movecount = 1;
 									mo->movedir = 1;
-									mo->cusval = player->itemscale;
 									P_SetTarget(&mo->target, player->mo);
 									P_SetTarget(&player->mo->hnext, mo);
 								}