From 77e85e08ea0d063c2ea77b3ad5d8ffe9d1f068f4 Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 11 Jan 2024 13:49:31 -0800 Subject: [PATCH] Clouds: always use map scale for vertical bounce --- src/objects/cloud.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/objects/cloud.c b/src/objects/cloud.c index b0f011dc2..8f2c88262 100644 --- a/src/objects/cloud.c +++ b/src/objects/cloud.c @@ -157,20 +157,8 @@ void Obj_PlayerCloudThink(player_t *player) if (P_MobjWasRemoved(mo->tracer)) return; - switch(mo->tracer->type) - { - case MT_AHZ_CLOUD: - P_SetObjectMomZ(mo, CLOUDB_ZTHRUST, false); - break; - case MT_AGZ_CLOUD: - mo->momz = FixedMul(mapobjectscale, CLOUD_ZTHRUST * P_MobjFlip(mo->tracer)); - break; - case MT_SSZ_CLOUD: - P_SetObjectMomZ(mo, CLOUD_ZTHRUST, false); - break; - default: - break; - } + mo->momz = FixedMul(mapobjectscale, + (mo->tracer->type == MT_AHZ_CLOUD ? CLOUDB_ZTHRUST : CLOUD_ZTHRUST) * P_MobjFlip(mo->tracer)); player->cloudlaunch = TICRATE; P_InstaThrust(mo, mo->cusval, mo->cvmem);