mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 17:54:15 +00:00
Code Issues Projects Releases Wiki Activity

a couple more suggestions

Browse source
This commit is contained in:
chandler 2020-04-06 17:08:24 -04:00
parent 9864211cdc
commit bd23567bfd
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
View file

@ -67,12 +67,12 @@ void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx) {
f32 scale; f32 scale;
scale = 0.119999997318f; scale = 0.12f;
this->actor.scale.x = scale; this->actor.scale.x = scale;
this->actor.scale.z = scale; this->actor.scale.z = scale;
scale = 0.00999999977648f; scale = 0.01f;
this->actor.scale.y = 0.00999999977648f; this->actor.scale.y = 0.01f;
this->unk_150 = 0; this->unk_150 = 0;
@ -98,10 +98,8 @@ s32 BgHidanFirewall_Proximity(BgHidanFirewall* this, GlobalContext* globalCtx) {
player = PLAYER; player = PLAYER;
func_8002DBD0(&this->actor, &distance, &player->actor.posRot.pos); func_8002DBD0(&this->actor, &distance, &player->actor.posRot.pos);
if (fabsf(distance.x) < 100.0f) { if (fabsf(distance.x) < 100.0f && fabsf(distance.z) < 120.0f) {
if (fabsf(distance.z) < 120.0f) { return 1;
return 1;
}
} }
return 0; return 0;
} }
@ -128,7 +126,7 @@ void BgHidanFirewall_Erupt(BgHidanFirewall* this, GlobalContext* globalCtx) {
if (BgHidanFirewall_Proximity(this, globalCtx) != 0) { if (BgHidanFirewall_Proximity(this, globalCtx) != 0) {
Math_ApproxF(&this->actor.scale.y, 0.1f, 0.024999999f); Math_ApproxF(&this->actor.scale.y, 0.1f, 0.024999999f);
} else { } else {
if (Math_ApproxF(&this->actor.scale.y, 0.00999999977648f, 0.00999999977648f) != 0) { if (Math_ApproxF(&this->actor.scale.y, 0.01f, 0.01f) != 0) {
this->actor.draw = NULL; this->actor.draw = NULL;
this->actionFunc = (ActorFunc)BgHidanFirewall_Wait; this->actionFunc = (ActorFunc)BgHidanFirewall_Wait;
} else { } else {