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

4
src/overlays/actors/ovl_En_Dh/z_en_dh.c
View file

@ -471,7 +471,7 @@ void EnDh_Death(EnDh* this, GlobalContext* globalCtx) {
void EnDh_CollisionCheck(EnDh* this, GlobalContext* globalCtx) {
s32 pad;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s32 lastHealth;
if ((this->collider2.base.acFlags & AC_HIT) && !this->retreat) {
@ -503,7 +503,7 @@ void EnDh_CollisionCheck(EnDh* this, GlobalContext* globalCtx) {
void EnDh_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnDh* this = THIS;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s32 pad40;
EnDh_CollisionCheck(this, globalCtx);