mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

Remove inline THIS-> from actors (#538)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* THIS

* PLAYER
This commit is contained in:
petrie911 2020-12-17 16:49:41 -06:00 • committed by GitHub
parent 6e78efd0c5
commit 0376242365
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 93 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
View file

@ -143,7 +143,10 @@ void ObjTimeblock_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjTimeblock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, THIS->dyna.dynaPolyId);
s32 pad;
ObjTimeblock* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
u8 ObjTimeblock_PlayerIsInRange(ObjTimeblock* this, GlobalContext* globalCtx) {
@ -330,8 +333,8 @@ void ObjTimeblock_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjTimeblock_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (THIS->isVisible) {
Color_RGB8* primColor = &sPrimColors[THIS->dyna.actor.initPosRot.rot.z & 7];
if (((ObjTimeblock*)thisx)->isVisible) {
Color_RGB8* primColor = &sPrimColors[thisx->initPosRot.rot.z & 7];
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_timeblock.c", 762);