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

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

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Fd/z_en_fd.c
View file

@ -269,7 +269,7 @@ s32 EnFd_CheckHammer(EnFd* this, GlobalContext* globalCtx) {
}
s32 EnFd_ColliderCheck(EnFd* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
ColliderInfo* info;
if (this->collider.base.acFlags & AC_HIT || EnFd_CheckHammer(this, globalCtx)) {
@ -374,7 +374,7 @@ Actor* EnFd_FindPotentialTheat(EnFd* this, GlobalContext* globalCtx) {
return NULL;
}
player = PLAYER;
player = GET_PLAYER(globalCtx);
if (!EnFd_CanSeeActor(this, &player->actor, globalCtx)) {
return NULL;
}