From baae615d0840be54689a196fd7b898722ed026dd Mon Sep 17 00:00:00 2001
From: lachablock <lachsrb2@gmail.com>
Date: Mon, 21 Jun 2021 15:10:57 +1000
Subject: [PATCH] Capsules FINALLY spawn properly on FOFs, and aerial capsules
 scale from the bottoms instead of their centers

---
 src/p_inter.c |  2 +-
 src/p_mobj.c  | 32 ++++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/p_inter.c b/src/p_inter.c
index 01c4b82de..ea2e3c348 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -284,7 +284,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			if ((gametyperules & GTR_BUMPERS) && player->bumpers <= 0)
 				return;
 
-			if (special->scale < special->destscale) // don't break it while it's respawning
+			if (special->scale < special->extravalue1) // don't break it while it's respawning
 				return;
 
 			S_StartSound(toucher, special->info->deathsound);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 007d15f12..8d9429b8f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6139,6 +6139,21 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
 		break;
 	}
 	case MT_ITEMCAPSULE:
+		// scale the capsule
+		if (mobj->scale < mobj->extravalue1)
+		{
+			fixed_t oldHeight = mobj->height;
+
+			if ((mobj->extravalue1 - mobj->scale) < mobj->scalespeed)
+				P_SetScale(mobj, mobj->destscale = mobj->extravalue1);
+			else
+				P_SetScale(mobj, mobj->destscale = mobj->scale + mobj->scalespeed);
+
+			if (mobj->eflags & MFE_VERTICALFLIP)
+				mobj->z -= (mobj->height - oldHeight);
+		}
+
+		// update & animate capsule
 		if (!P_MobjWasRemoved(mobj->tracer))
 		{
 			mobj_t *part = mobj->tracer;
@@ -9434,17 +9449,18 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 			mobj->movecount = 1;
 #endif
 
-			// set starting scale
-			mobj->scalespeed >>= 1;
-			P_SetScale(mobj, mapobjectscale >> 4);
-			if (mobj->eflags & MFE_VERTICALFLIP)
-				mobj->z += (oldHeight - mobj->height);
-
 			// grounded/aerial properties
-			P_CheckPosition(mobj, mobj->x, mobj->y); // look for FOFs
+			P_AdjustMobjFloorZ_FFloors(mobj, mobj->subsector->sector, 0);
 			if (!P_IsObjectOnGround(mobj))
 				mobj->flags |= MF_NOGRAVITY;
 
+			// set starting scale
+			mobj->extravalue1 = mobj->scale; // this acts as the capsule's destscale; we're avoiding P_MobjScaleThink because we want aerial capsules not to scale from their center
+			mobj->scalespeed >>= 1;
+			P_SetScale(mobj, mobj->destscale = mapobjectscale >> 4);
+			if (mobj->eflags & MFE_VERTICALFLIP)
+				mobj->z += (oldHeight - mobj->height);
+
 			break;
 		}
 		case MT_KARMAHITBOX:
@@ -11718,7 +11734,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 		// Ambush = double size (grounded) / half size (aerial)
 		if (!(mthing->options & MTF_AMBUSH) == !P_IsObjectOnGround(mobj))
 		{
-			mobj->destscale = min(mobj->destscale << 1, FixedDiv(64*FRACUNIT, mobj->info->radius)); // don't make them larger than the blockmap can handle
+			mobj->extravalue1 = min(mobj->extravalue1 << 1, FixedDiv(64*FRACUNIT, mobj->info->radius)); // don't make them larger than the blockmap can handle
 			mobj->scalespeed <<= 1;
 		}
 		break;