mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Rename Matrix_Pull to Matrix_Pop (#703)

Browse source
This commit is contained in:
Roman971 2021-02-24 20:28:04 +01:00 • committed by GitHub
parent 3eec91504c
commit d30ef91417
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
89 changed files with 158 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Gm/z_en_gm.c
View file

@ -304,13 +304,13 @@ void func_80A3E090(EnGm* this) {
this->collider.dim.pos.x = vec2.x;
this->collider.dim.pos.y = vec2.y;
this->collider.dim.pos.z = vec2.z;
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(0.0f, 0.0f, 4300.0f, MTXMODE_APPLY);
Matrix_RotateRPY(this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, MTXMODE_APPLY);
vec1.x = vec1.y = vec1.z = 0.0f;
Matrix_MultVec3f(&vec1, &this->talkPos);
Matrix_Pull();
Matrix_Pop();
Matrix_Translate(0.0f, 0.0f, 3800.0f, MTXMODE_APPLY);
Matrix_RotateRPY(this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, MTXMODE_APPLY);
vec1.x = vec1.y = vec1.z = 0.0f;