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

20
src/overlays/actors/ovl_En_Test/z_en_test.c
View file

@ -360,7 +360,7 @@ void EnTest_ChooseRandomAction(EnTest* this, GlobalContext* globalCtx) {
void EnTest_ChooseAction(EnTest* this, GlobalContext* globalCtx) {
s32 pad;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 yawDiff = player->actor.shape.rot.y - this->actor.shape.rot.y;
yawDiff = ABS(yawDiff);
@ -485,7 +485,7 @@ void EnTest_SetupIdle(EnTest* this) {
}
void EnTest_Idle(EnTest* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 yawDiff;
SkelAnime_Update(&this->skelAnime);
@ -572,7 +572,7 @@ void EnTest_WalkAndBlock(EnTest* this, GlobalContext* globalCtx) {
s32 prevFrame;
s32 temp_f16;
f32 playSpeed;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 absPlaySpeed;
s16 yawDiff;
s32 temp_v0_2;
@ -799,7 +799,7 @@ void func_80860F84(EnTest* this, GlobalContext* globalCtx) {
s32 prevFrame;
s32 temp_f16;
s16 yawDiff;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 checkDist = 0.0f;
s16 newYaw;
f32 absPlaySpeed;
@ -946,7 +946,7 @@ void EnTest_SetupSlashDownEnd(EnTest* this) {
}
void EnTest_SlashDownEnd(EnTest* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 yawDiff;
if (SkelAnime_Update(&this->skelAnime)) {
@ -1223,7 +1223,7 @@ void func_80862154(EnTest* this) {
}
void func_808621D4(EnTest* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.1f, 0.0f);
@ -1265,7 +1265,7 @@ void func_80862398(EnTest* this) {
}
void func_80862418(EnTest* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.1f, 0.0f);
@ -1318,7 +1318,7 @@ void EnTest_SetupStunned(EnTest* this) {
}
void EnTest_Stunned(EnTest* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f);
@ -1366,7 +1366,7 @@ void func_808627C4(EnTest* this, GlobalContext* globalCtx) {
// a variation of sidestep
void func_808628C8(EnTest* this, GlobalContext* globalCtx) {
s32 pad;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s32 pad1;
s32 prevFrame;
s32 temp_f16;
@ -1655,7 +1655,7 @@ void EnTest_UpdateHeadRot(EnTest* this, GlobalContext* globalCtx) {
}
void EnTest_UpdateDamage(EnTest* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (this->shieldCollider.base.acFlags & AC_BOUNCED) {
this->shieldCollider.base.acFlags &= ~AC_BOUNCED;