mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +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_Dodongo/z_en_dodongo.c
View file

@ -528,7 +528,7 @@ void EnDodongo_SwallowBomb(EnDodongo* this, GlobalContext* globalCtx) {
void EnDodongo_Walk(EnDodongo* this, GlobalContext* globalCtx) {
s32 pad;
f32 playbackSpeed;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 yawDiff = (s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y);
yawDiff = ABS(yawDiff);
@ -649,7 +649,7 @@ void EnDodongo_SweepTail(EnDodongo* this, GlobalContext* globalCtx) {
Actor_SpawnFloorDustRing(globalCtx, &this->actor, &tailPos, 5.0f, 2, 2.0f, 100, 15, 0);
if (this->colliderBody.base.atFlags & AT_HIT) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (this->colliderBody.base.at == &player->actor) {
Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT);