mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-13 04:39:36 +00:00
Code Issues Projects Releases Wiki Activity

fix function (#1118)

Browse source
This commit is contained in:
fig02 2022-01-24 18:55:34 -05:00 committed by GitHub
parent 2dbe518f16
commit 7877966f03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
View file

@ -338,33 +338,18 @@ void ObjOshihiki_SetFloors(ObjOshihiki* this, GlobalContext* globalCtx) {
} }
s16 ObjOshihiki_GetHighestFloor(ObjOshihiki* this) { s16 ObjOshihiki_GetHighestFloor(ObjOshihiki* this) {
s32 i;
s16 highestFloor = 0; s16 highestFloor = 0;
s16 temp = 1;
f32 phi_f0 = this->floorHeights[temp];
if (phi_f0 > this->floorHeights[highestFloor]) { for (i = 1; i < ARRAY_COUNT(this->floorHeights); i++) {
highestFloor = temp; if (this->floorHeights[i] > this->floorHeights[highestFloor]) {
} else if ((this->floorBgIds[temp] == BGCHECK_SCENE) && ((phi_f0 - this->floorHeights[highestFloor]) > -0.001f)) { highestFloor = i;
highestFloor = temp; } else if ((this->floorBgIds[i] == BGCHECK_SCENE) &&
} ((this->floorHeights[i] - this->floorHeights[highestFloor]) > -0.001f)) {
if (this->floorHeights[temp + 1] > this->floorHeights[highestFloor]) { highestFloor = i;
highestFloor = temp + 1; }
} else if ((this->floorBgIds[temp + 1] == BGCHECK_SCENE) &&
((this->floorHeights[temp + 1] - this->floorHeights[highestFloor]) > -0.001f)) {
highestFloor = temp + 1;
}
if (this->floorHeights[temp + 2] > this->floorHeights[highestFloor]) {
highestFloor = temp + 2;
} else if ((this->floorBgIds[temp + 2] == BGCHECK_SCENE) &&
((this->floorHeights[temp + 2] - this->floorHeights[highestFloor]) > -0.001f)) {
highestFloor = temp + 2;
}
if (this->floorHeights[temp + 3] > this->floorHeights[highestFloor]) {
highestFloor = temp + 3;
} else if ((this->floorBgIds[temp + 3] == BGCHECK_SCENE) &&
((this->floorHeights[temp + 3] - this->floorHeights[highestFloor]) > -0.001f)) {
highestFloor = temp + 3;
} }
return highestFloor; return highestFloor;
} }