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

10
src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
View file

@ -34,13 +34,13 @@ void OceffWipe2_Init(Actor* thisx, GlobalContext* globalCtx) {
OceffWipe2* this = THIS;
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) " WIPE2 arg_data = %d\n" VT_RST, this->actor.params);
}
void OceffWipe2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
OceffWipe2* this = THIS;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
func_800876C8(globalCtx);
if (gSaveContext.nayrusLoveTimer != 0) {
@ -50,7 +50,7 @@ void OceffWipe2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void OceffWipe2_Update(Actor* thisx, GlobalContext* globalCtx) {
OceffWipe2* 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 {
@ -68,8 +68,8 @@ void OceffWipe2_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));
if (this->counter < 32) {
z = Math_SinS(this->counter << 9) * 1330;
} else {