diff options
| author | krimtonz <33664508+krimtonz@users.noreply.github.com> | 2020-05-07 18:18:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 19:18:09 -0400 |
| commit | 0ebe904d0c0511b48cae28670b8dfcad7e12fadf (patch) | |
| tree | 4ff2807a14f6b1a8df023f97d803f3dce0fb3a21 /src/code | |
| parent | 5acc4e2f66b17c08b0194d3eecbb76e3fa58c7be (diff) | |
En_Floormas OK (#97)
* EnFloorMas wip
* floormaster formatting
* floormaster wip
* ovl_En_Floormas OK
* pr recommendations
* pr updates
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 2 | ||||
| -rw-r--r-- | src/code/z_en_a_keep.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 250402d45..97cd22c7c 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1253,7 +1253,7 @@ void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f &actor->wallPoly, &sp60, actor, arg2))) { sp5C = actor->wallPoly; Math_Vec3f_Copy(&actor->posRot.pos, &sp64); - actor->unk_7E = atan2s(sp5C->norm.z, sp5C->norm.x); + actor->wallPolyRot = atan2s(sp5C->norm.z, sp5C->norm.x); actor->bgCheckFlags |= 8; actor->wallPolySource = sp60; } else { diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 3358876b9..2e7266d05 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -273,7 +273,8 @@ void func_8001D4A8(EnAObj* this, GlobalContext* globalCtx) { if ((this->dyna.actor.speedXZ != 0.0f) && (this->dyna.actor.bgCheckFlags & 0x8)) { if (1) { // Necessary to match this->dyna.actor.posRot.rot.y = - ((this->dyna.actor.unk_7E - this->dyna.actor.posRot.rot.y) + this->dyna.actor.unk_7E) - 0x8000; + ((this->dyna.actor.wallPolyRot - this->dyna.actor.posRot.rot.y) + this->dyna.actor.wallPolyRot) - + 0x8000; } this->dyna.actor.bgCheckFlags &= ~0x8; } |