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

@ -122,7 +122,7 @@ void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) {
Vec3f hitPoint;
s32 pad2;
player = PLAYER;
player = GET_PLAYER(globalCtx);
target = this->moveTo;
// If the boomerang is moving toward a targeted actor, handle setting the proper x and y angle to fly toward it.
@ -240,7 +240,7 @@ void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) {
void EnBoom_Update(Actor* thisx, GlobalContext* globalCtx) {
EnBoom* this = THIS;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (!(player->stateFlags1 & 0x20000000)) {
this->actionFunc(this, globalCtx);