From b91823540bddf0e4d7cda56a4f56231b513687e7 Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 17 Oct 2023 20:57:19 +0100 Subject: [PATCH] UC_PRISONEGGCD: Don't use K_FlipFromObject, this was heinously incorrect --- src/p_inter.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 6b2f248d8..c8c7212f2 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1042,12 +1042,15 @@ static void P_AddBrokenPrison(mobj_t *target, mobj_t *source) { secretpickup->hitlag = target->hitlag; + secretpickup->z -= secretpickup->height/2; + P_SetScale(secretpickup, mapobjectscale/TICRATE); // secretpickup->destscale = mapobjectscale; -- safe assumption it's already set? secretpickup->scalespeed = (2*mapobjectscale)/(3*TICRATE); - // NOT from the target - just in case it's just been placed on the ceiling as a gimmick - K_FlipFromObject(secretpickup, source); + // flags are NOT from the target - just in case it's just been placed on the ceiling as a gimmick + secretpickup->flags2 |= (source->flags2 & MF2_OBJECTFLIP); + secretpickup->eflags |= (source->eflags & MFE_VERTICALFLIP); // Okay these have to use M_Random because replays... // The spawning of these won't be recorded back!