mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +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

6
src/overlays/actors/ovl_En_St/z_en_st.c
View file

@ -309,7 +309,7 @@ void EnSt_InitColliders(EnSt* this, GlobalContext* globalCtx) {
void EnSt_CheckBodyStickHit(EnSt* this, GlobalContext* globalCtx) {
ColliderInfo* body = &this->colCylinder[0].info;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (player->unk_860 != 0) {
body->bumper.dmgFlags |= 2;
@ -384,7 +384,7 @@ void EnSt_UpdateCylinders(EnSt* this, GlobalContext* globalCtx) {
}
s32 EnSt_CheckHitLink(EnSt* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s32 hit;
s32 i;
@ -692,7 +692,7 @@ void EnSt_Bob(EnSt* this, GlobalContext* globalCtx) {
}
s32 EnSt_IsCloseToPlayer(EnSt* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 yDist;
if (this->takeDamageSpinTimer != 0) {