mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 16:30: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

6
src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
View file

@ -95,7 +95,7 @@ static DamageTable sDamageTable[] = {
};
void EnAnubice_Hover(EnAnubice* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
this->hoverVelocityTimer += 1500.0f;
this->targetHeight = player->actor.world.pos.y + this->playerHeightOffset;
@ -109,7 +109,7 @@ void EnAnubice_SetFireballRot(EnAnubice* this, GlobalContext* globalCtx) {
f32 x;
f32 y;
f32 z;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
x = player->actor.world.pos.x - this->fireballPos.x;
y = player->actor.world.pos.y + 10.0f - this->fireballPos.y;
@ -204,7 +204,7 @@ void EnAnubice_SetupIdle(EnAnubice* this, GlobalContext* globalCtx) {
}
void EnAnubice_Idle(EnAnubice* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
SkelAnime_Update(&this->skelAnime);
Math_ApproachZeroF(&this->actor.shape.yOffset, 0.5f, 300.0f);