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

10
src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
View file

@ -40,13 +40,13 @@ void OceffWipe_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.1f);
this->counter = 0;
this->actor.world.pos = ACTIVE_CAM->eye;
this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye;
osSyncPrintf(VT_FGCOL(CYAN) " WIPE arg_data = %d\n" VT_RST, this->actor.params);
}
void OceffWipe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
OceffWipe* this = THIS;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
func_800876C8(globalCtx);
if (gSaveContext.nayrusLoveTimer != 0) {
@ -57,7 +57,7 @@ void OceffWipe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void OceffWipe_Update(Actor* thisx, GlobalContext* globalCtx) {
OceffWipe* this = THIS;
this->actor.world.pos = ACTIVE_CAM->eye;
this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye;
if (this->counter < 100) {
this->counter++;
} else {
@ -76,8 +76,8 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
Vtx* vtxPtr;
Vec3f vec;
eye = ACTIVE_CAM->eye;
Camera_GetSkyboxOffset(&vec, ACTIVE_CAM);
eye = GET_ACTIVE_CAM(globalCtx)->eye;
Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(globalCtx));
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 346);