From dbc1b9aacf9790c2ee6d5e732cae697b998f98fb Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Sun, 9 May 2021 00:09:28 -0400 Subject: [PATCH] fix goto in bike.c --- src/bike.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/bike.c b/src/bike.c index bbcda989c..62ce3cd44 100644 --- a/src/bike.c +++ b/src/bike.c @@ -614,27 +614,24 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) return; } collision = GetBikeCollision(direction); - // TODO: Try to get rid of this goto - if (collision == 0 || collision == COLLISION_WHEELIE_HOP) - { - goto derp; - } - else if (collision == COLLISION_LEDGE_JUMP) - { - PlayerLedgeHoppingWheelie(direction); - } - else if (collision < COLLISION_STOP_SURFING || collision > COLLISION_ROTATING_GATE) + if (collision && collision != COLLISION_WHEELIE_HOP) { + if (collision == COLLISION_LEDGE_JUMP) + { + PlayerLedgeHoppingWheelie(direction); + return; + } + if (collision >= COLLISION_STOP_SURFING && collision <= COLLISION_ROTATING_GATE) + { + return; + } if (collision < COLLISION_VERTICAL_RAIL) { AcroBikeTransition_WheelieHoppingStanding(direction); - } - else - { - derp: - PlayerMovingHoppingWheelie(direction); + return; } } + PlayerMovingHoppingWheelie(direction); } static void AcroBikeTransition_SideJump(u8 direction)