From 1128c200e2e408cd292262bde6e280822f012c22 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Sat, 6 Apr 2024 12:14:20 -0300 Subject: [PATCH] rewrite func_hud_800915FC --- src/engine/fox_hud.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/engine/fox_hud.c b/src/engine/fox_hud.c index 2db59f19..178bc597 100644 --- a/src/engine/fox_hud.c +++ b/src/engine/fox_hud.c @@ -4156,7 +4156,7 @@ bool func_hud_800915FC(Actor* actor) { Vec3f vec; Boss* boss; Object_58* obj58; - s32 ret = false; + bool ret = false; Math_Vec3fFromAngles(&vec, 0.0f, actor->unk_0F4.y, 650.0f + actor->fwork[9] * 10.0f); @@ -4200,19 +4200,12 @@ bool func_hud_800915FC(Actor* actor) { y = 280.0f; } - while (true) { - if (fabsf(boss->obj.pos.x - (actor->obj.pos.x + vec.x)) > 1000.0f) { - break; - } - if (fabsf(boss->obj.pos.z - (actor->obj.pos.z + vec.z)) > 1000.0f) { - break; - } - if (fabsf(boss->obj.pos.y - (actor->obj.pos.y)) > y) { - break; - } + if (!(fabsf(boss->obj.pos.x - (actor->obj.pos.x + vec.x)) > 1000.0f) && + !(fabsf(boss->obj.pos.z - (actor->obj.pos.z + vec.z)) > 1000.0f) && + !(fabsf(boss->obj.pos.y - (actor->obj.pos.y)) > y)) { ret = true; - break; } + return ret; }