From 41b9cd04873a1a4fb59650866b0f6708d03bf30b Mon Sep 17 00:00:00 2001 From: feacur Date: Tue, 12 Nov 2024 09:40:32 +0100 Subject: [PATCH] rematch `EnGo2_StopRolling` --- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index dec69d2500..9fcfe8614c 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -1395,16 +1395,19 @@ void EnGo2_StartRolling(EnGo2* this, PlayState* play) { void EnGo2_StopRolling(EnGo2* this, PlayState* play) { EnBom* bomb; - if ((ENGO2_GET_TYPE(this) != GORON_CITY_ROLLING_BIG) && (ENGO2_GET_TYPE(this) != GORON_CITY_LINK)) { - if (ENGO2_GET_TYPE(this) == GORON_DMT_ROLLING_SMALL) { + switch (ENGO2_GET_TYPE(this)) { + case GORON_DMT_ROLLING_SMALL: bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0); if (bomb != NULL) { bomb->timer = 0; } - } - } else { - this->collider.elem.acElemFlags = ACELEM_NONE; + break; + + case GORON_CITY_LINK: + case GORON_CITY_ROLLING_BIG: + this->collider.elem.acElemFlags = ACELEM_NONE; + break; } this->actor.shape.rot = this->actor.world.rot;