mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +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

10
src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
View file

@ -494,7 +494,7 @@ void EnPeehat_Ground_SetStateSeekPlayer(EnPeehat* this) {
}
void EnPeehat_Ground_StateSeekPlayer(EnPeehat* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
Math_SmoothStepToF(&this->actor.speedXZ, 3.0f, 1.0f, 0.25f, 0.0f);
Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.floorHeight + 80.0f, 1.0f, 3.0f, 0.0f);
@ -560,7 +560,7 @@ void EnPeehat_Larva_StateSeekPlayer(EnPeehat* this, GlobalContext* globalCtx) {
EnPeehat_SetStateAttackRecoil(this);
} else if ((this->colQuad.base.atFlags & AT_HIT) || (this->colCylinder.base.acFlags & AC_HIT) ||
(this->actor.bgCheckFlags & 1)) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
this->colQuad.base.atFlags &= ~AT_HIT;
if (!(this->colCylinder.base.acFlags & AC_HIT) && &player->actor == this->colQuad.base.at) {
if (Rand_ZeroOne() > 0.5f) {
@ -656,7 +656,7 @@ void EnPeehat_Ground_SetStateHover(EnPeehat* this) {
void EnPeehat_Ground_StateHover(EnPeehat* this, GlobalContext* globalCtx) {
f32 cos;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
// hover but don't gain altitude
if (this->actor.world.pos.y - this->actor.floorHeight > 75.0f) {
@ -705,7 +705,7 @@ void EnPeehat_Ground_StateReturnHome(EnPeehat* this, GlobalContext* globalCtx) {
s16 yRot;
Player* player;
player = PLAYER;
player = GET_PLAYER(globalCtx);
if (this->actor.world.pos.y - this->actor.floorHeight > 75.0f) {
this->actor.world.pos.y -= 1.0f;
} else {
@ -921,7 +921,7 @@ void EnPeehat_Adult_CollisionCheck(EnPeehat* this, GlobalContext* globalCtx) {
void EnPeehat_Update(Actor* thisx, GlobalContext* globalCtx) {
EnPeehat* this = THIS;
s32 i;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
// If Adult Peahat
if (thisx->params <= 0) {