mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 20:35:13 +00:00
Code Issues Projects Releases Wiki Activity

Use Side enum

Browse source
This commit is contained in:
Sirius902 2020-11-15 02:08:24 -08:00
parent fa3f9e7a05
commit efebb9eb4e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
View file

@ -214,16 +214,16 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, GlobalContext* globalCtx) {
this->flashYScale = 0.0f; this->flashYScale = 0.0f;
Math_SmoothScaleMaxF(&this->dyna.actor.posRot.pos.y, -1000.0f, 1.0f, this->dyna.actor.speedXZ); Math_SmoothScaleMaxF(&this->dyna.actor.posRot.pos.y, -1000.0f, 1.0f, this->dyna.actor.speedXZ);
Math_SmoothScaleMaxF(&this->dyna.actor.speedXZ, 100.0f, 1.0f, 2.0f); Math_SmoothScaleMaxF(&this->dyna.actor.speedXZ, 100.0f, 1.0f, 2.0f);
if (!(this->unk_16B & 1)) { if (!(this->unk_16B & SIDE_FRONT)) {
this->dyna.actor.shape.rot.z -= (s16)(this->dyna.actor.speedXZ * 30.0f); this->dyna.actor.shape.rot.z -= (s16)(this->dyna.actor.speedXZ * 30.0f);
} }
if (!(this->unk_16B & 2)) { if (!(this->unk_16B & SIDE_BACK)) {
this->dyna.actor.shape.rot.z += (s16)(this->dyna.actor.speedXZ * 30.0f); this->dyna.actor.shape.rot.z += (s16)(this->dyna.actor.speedXZ * 30.0f);
} }
if (!(this->unk_16B & 4)) { if (!(this->unk_16B & SIDE_RIGHT)) {
this->dyna.actor.shape.rot.x += (s16)(this->dyna.actor.speedXZ * 30.0f); this->dyna.actor.shape.rot.x += (s16)(this->dyna.actor.speedXZ * 30.0f);
} }
if (!(this->unk_16B & 8)) { if (!(this->unk_16B & SIDE_LEFT)) {
this->dyna.actor.shape.rot.x -= (s16)(this->dyna.actor.speedXZ * 30.0f); this->dyna.actor.shape.rot.x -= (s16)(this->dyna.actor.speedXZ * 30.0f);
} }
if (this->dyna.actor.posRot.pos.y < -750.0f) { if (this->dyna.actor.posRot.pos.y < -750.0f) {