mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 06:10:21 +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_Boss_Fd2/z_boss_fd2.c
View file

@ -227,7 +227,7 @@ void BossFd2_SetupEmerge(BossFd2* this, GlobalContext* globalCtx) {
void BossFd2_Emerge(BossFd2* this, GlobalContext* globalCtx) {
s8 health;
BossFd* bossFd = (BossFd*)this->actor.parent;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 i;
s16 holeTime;
@ -402,7 +402,7 @@ void BossFd2_BreatheFire(BossFd2* this, GlobalContext* globalCtx) {
s16 angleY;
s16 breathOpacity = 0;
BossFd* bossFd = (BossFd*)this->actor.parent;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 tempX;
f32 tempY;
@ -810,7 +810,7 @@ void BossFd2_CollisionCheck(BossFd2* this, GlobalContext* globalCtx) {
BossFd* bossFd = (BossFd*)this->actor.parent;
if (this->actionFunc == BossFd2_ClawSwipe) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
for (i = 0; i < ARRAY_COUNT(this->elements); i++) {
if (this->collider.elements[i].info.toucherFlags & TOUCH_HIT) {