1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +00:00

Macros: PLAYER -> GET_PLAYER(globalCtx), ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx) (#921)

* PLAYER -> GET_PLAYER(globalCtx)

* ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx)

* PR Suggestions

* formatter

* Add brackets

* remove from actorfixer.py

* Bring back actorfixer.py change
This commit is contained in:
engineer124 2021-08-31 20:22:03 +10:00 committed by GitHub
parent f8498478c4
commit 1117783731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
281 changed files with 1013 additions and 979 deletions

View file

@ -544,7 +544,7 @@ void EnZl2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
}
{
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
Matrix_Push();
if (player->rightHandType == 0xFF) {
Matrix_Put(&player->shieldMf);
@ -629,7 +629,7 @@ void EnZl2_GiveLightArrows(EnZl2* this, GlobalContext* globalCtx) {
f32 posZ;
if (this->unk_244 == 0) {
player = PLAYER;
player = GET_PLAYER(globalCtx);
posX = player->actor.world.pos.x;
posY = player->actor.world.pos.y + 80.0f;
posZ = player->actor.world.pos.z;
@ -1179,7 +1179,7 @@ void func_80B513A8(EnZl2* this, GlobalContext* globalCtx) {
f32 posZ;
if (this->unk_250 == 0) {
player = PLAYER;
player = GET_PLAYER(globalCtx);
posX = player->actor.world.pos.x;
posY = player->actor.world.pos.y;
posZ = player->actor.world.pos.z;