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

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

7
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
View file

@ -145,8 +145,11 @@ void ObjComb_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjComb_SetupWait(this);
}
void ObjComb_Destroy(Actor* thisx, GlobalContext* globalCtx) {
Collider_DestroyJntSph(globalCtx, &THIS->collider);
void ObjComb_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
ObjComb* this = THIS;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
void ObjComb_SetupWait(ObjComb* this) {