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

More actor cleanup Part 2 (#116)

Browse source 
* Change all main actor functions to take a 'Actor* thisx' argument

* Change all actor callbacks to also take a 'Actor* thisx' argument
This commit is contained in:
Roman971 2020-05-04 21:02:51 +02:00 • committed by GitHub
parent 8efddb0fe0
commit f114df8929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
429 changed files with 3689 additions and 2523 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
View file

@ -10,8 +10,11 @@
#define FLAGS 0x00000010
void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx);
void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx);
#define THIS ((ObjMakekinsuta*)thisx)
void ObjMakekinsuta_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjMakekinsuta_Update(Actor* thisx, GlobalContext* globalCtx);
void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx);
void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx);
@ -27,7 +30,9 @@ const ActorInit Obj_Makekinsuta_InitVars = {
NULL,
};
void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx) {
void ObjMakekinsuta_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjMakekinsuta* this = THIS;
if ((this->actor.params & 0x6000) == 0x4000) {
osSyncPrintf(VT_FGCOL(BLUE));
// Translation: Gold Star Enemy(arg_data %x)
@ -60,6 +65,8 @@ void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx) {
void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx) {
}
void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx) {
void ObjMakekinsuta_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjMakekinsuta* this = THIS;
this->actionFunc(this, globalCtx);
}