mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 08:50:23 +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_Niw/z_en_niw.c
View file

@ -447,7 +447,7 @@ void func_80AB63A8(EnNiw* this, GlobalContext* globalCtx) {
}
void func_80AB6450(EnNiw* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (this->actor.xzDistToPlayer < 30.0f && fabsf(this->actor.world.pos.y - player->actor.world.pos.y) < 5.0f) {
this->timer6 = 100;
@ -827,7 +827,7 @@ void func_80AB7290(EnNiw* this, GlobalContext* globalCtx) {
}
void func_80AB7328(EnNiw* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (this->timer6 == 0) {
this->unk_2AC.x = this->unk_2B8.x = this->actor.world.pos.x;
@ -875,7 +875,7 @@ void func_80AB747C(EnNiw* this, GlobalContext* globalCtx) {
void EnNiw_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad1;
EnNiw* this = THIS;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 i;
s16 featherCount;
Vec3f zeroVec1 = { 0.0f, 0.0f, 0.0f };