From f7fd39402abc01a34441514dcfcda7eb27929b79 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 12 Feb 2021 16:20:18 -0800 Subject: [PATCH] Float flag for rings and horizontal springs no longer scales twice in mobjscaled maps --- src/p_mobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 96a10458f..2bc6c620f 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10724,7 +10724,7 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt case MT_YELLOWHORIZ: case MT_REDHORIZ: case MT_BLUEHORIZ: - offset += mthing->options & MTF_AMBUSH ? 16*mapobjectscale : 0; + offset += mthing->options & MTF_AMBUSH ? 16*FRACUNIT : 0; break; // Ring-like items, may float additional units with MTF_AMBUSH. @@ -10732,7 +10732,7 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt case MT_EMBLEM: case MT_RING: case MT_BLUESPHERE: - offset += mthing->options & MTF_AMBUSH ? 24*mapobjectscale : 0; + offset += mthing->options & MTF_AMBUSH ? 24*FRACUNIT : 0; break; // This object does not have an offset