mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 06:10:21 +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_Mk/z_en_mk.c
View file

@ -152,7 +152,7 @@ void func_80AACCA0(EnMk* this, GlobalContext* globalCtx) {
}
void func_80AACD48(EnMk* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) {
func_80106CCC(globalCtx);
@ -214,7 +214,7 @@ void func_80AAD014(EnMk* this, GlobalContext* globalCtx) {
void EnMk_Wait(EnMk* this, GlobalContext* globalCtx) {
s16 angle;
s32 swimFlag;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s32 playerExchangeItem;
if (func_8002F194(&this->actor, globalCtx) != 0) {
@ -306,7 +306,7 @@ void EnMk_Update(Actor* thisx, GlobalContext* globalCtx) {
Math_SmoothStepToS(&this->headRotation.y, 0, 6, 6200, 100);
}
player = PLAYER;
player = GET_PLAYER(globalCtx);
if (this->flags & 8) {
if (!(player->stateFlags2 & 0x400)) {