mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-17 05:15:16 +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

18
src/code/z_player_lib.c
View file

@ -304,7 +304,7 @@ s32 Player_InBlockingCsMode(GlobalContext* globalCtx, Player* this) {
}
s32 Player_InCsMode(GlobalContext* globalCtx) {
Player* this = PLAYER;
Player* this = GET_PLAYER(globalCtx);
return Player_InBlockingCsMode(globalCtx, this) || (this->unk_6AD == 4);
}
@ -419,7 +419,7 @@ void func_8008EE08(Player* this) {
}
void func_8008EEAC(GlobalContext* globalCtx, Actor* actor) {
Player* this = PLAYER;
Player* this = GET_PLAYER(globalCtx);
func_8008EE08(this);
this->unk_664 = actor;
@ -430,7 +430,7 @@ void func_8008EEAC(GlobalContext* globalCtx, Actor* actor) {
}
s32 func_8008EF30(GlobalContext* globalCtx) {
Player* this = PLAYER;
Player* this = GET_PLAYER(globalCtx);
return (this->stateFlags1 & 0x800000);
}
@ -441,7 +441,7 @@ s32 func_8008EF44(GlobalContext* globalCtx, s32 ammo) {
}
s32 Player_IsBurningStickInRange(GlobalContext* globalCtx, Vec3f* pos, f32 xzRange, f32 yRange) {
Player* this = PLAYER;
Player* this = GET_PLAYER(globalCtx);
Vec3f diff;
s32 pad;
@ -466,13 +466,13 @@ s32 Player_GetStrength(void) {
}
u8 Player_GetMask(GlobalContext* globalCtx) {
Player* this = PLAYER;
Player* this = GET_PLAYER(globalCtx);
return this->currentMask;
}
Player* Player_UnsetMask(GlobalContext* globalCtx) {
Player* this = PLAYER;
Player* this = GET_PLAYER(globalCtx);
this->currentMask = PLAYER_MASK_NONE;
@ -480,13 +480,13 @@ Player* Player_UnsetMask(GlobalContext* globalCtx) {
}
s32 Player_HasMirrorShieldEquipped(GlobalContext* globalCtx) {
Player* this = PLAYER;
Player* this = GET_PLAYER(globalCtx);
return (this->currentShield == PLAYER_SHIELD_MIRROR);
}
s32 Player_HasMirrorShieldSetToDraw(GlobalContext* globalCtx) {
Player* this = PLAYER;
Player* this = GET_PLAYER(globalCtx);
return (this->rightHandType == 10) && (this->currentShield == PLAYER_SHIELD_MIRROR);
}
@ -580,7 +580,7 @@ return_neg:
}
s32 func_8008F2F8(GlobalContext* globalCtx) {
Player* this = PLAYER;
Player* this = GET_PLAYER(globalCtx);
TextTriggerEntry* triggerEntry;
s32 var;