1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 17:00:19 +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

@ -470,7 +470,7 @@ void EnOkuta_Freeze(EnOkuta* this, GlobalContext* globalCtx) {
void EnOkuta_ProjectileFly(EnOkuta* this, GlobalContext* globalCtx) {
Vec3f pos;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
Vec3s sp40;
this->timer--;
@ -574,7 +574,7 @@ void EnOkuta_ColliderCheck(EnOkuta* this, GlobalContext* globalCtx) {
void EnOkuta_Update(Actor* thisx, GlobalContext* globalCtx2) {
EnOkuta* this = THIS;
GlobalContext* globalCtx = globalCtx2;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
WaterBox* outWaterBox;
f32 ySurface;
Vec3f sp38;