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

4
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
View file

@ -155,7 +155,7 @@ void EnArrow_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void EnArrow_Shoot(EnArrow* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (this->actor.parent == NULL) {
if ((this->actor.params != ARROW_NUT) && (player->unk_A73 == 0)) {
@ -389,7 +389,7 @@ void func_809B4640(EnArrow* this, GlobalContext* globalCtx) {
void EnArrow_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnArrow* this = THIS;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (this->isCsNut || ((this->actor.params >= ARROW_NORMAL_LIT) && (player->unk_A73 != 0)) ||
!Player_InBlockingCsMode(globalCtx, player)) {