mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 00:00:44 +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_Skb/z_en_skb.c
View file

@ -259,7 +259,7 @@ void EnSkb_Advance(EnSkb* this, GlobalContext* globalCtx) {
s32 thisKeyFrame;
s32 prevKeyFrame;
f32 playSpeed;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if ((this->unk_283 != 0) && ((globalCtx->gameplayFrames & 0xF) == 0)) {
this->unk_288 = Rand_CenteredFloat(50000.0f);
@ -474,7 +474,7 @@ void func_80AFD968(EnSkb* this, GlobalContext* globalCtx) {
func_80AFD7B4(this, globalCtx);
return;
}
player = PLAYER;
player = GET_PLAYER(globalCtx);
if (this->unk_283 == 0) {
if ((this->actor.colChkInfo.damageEffect == 0xD) ||
((this->actor.colChkInfo.damageEffect == 0xE) &&