mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21: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_Bombf/z_en_bombf.c
View file

@ -147,7 +147,7 @@ void EnBombf_GrowBomb(EnBombf* this, GlobalContext* globalCtx) {
EnBombf* bombFlower;
s32 pad;
s32 pad1;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s32 pad2;
if (this->flowerBombScale >= 1.0f) {
@ -301,7 +301,7 @@ void EnBombf_Explode(EnBombf* this, GlobalContext* globalCtx) {
}
if (this->timer == 0) {
player = PLAYER;
player = GET_PLAYER(globalCtx);
if ((player->stateFlags1 & 0x800) && (player->heldActor == &this->actor)) {
player->actor.child = NULL;