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

21
src/overlays/actors/ovl_En_OE2/z_en_oe2.c
View file

@ -8,12 +8,15 @@
#define FLAGS 0x00000009
#define THIS ((EnOE2*)thisx)
void EnOE2_Init(Actor* thisx, GlobalContext* globalCtx);
void EnOE2_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnOE2_Update(Actor* thisx, GlobalContext* globalCtx);
void EnOE2_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80ABE6A0(EnOE2* this, ActorFunc func);
void EnOE2_Init(EnOE2* this, GlobalContext* globalCtx);
void EnOE2_Destroy(EnOE2* this, GlobalContext* globalCtx);
void func_80ABE6DC(EnOE2* this, GlobalContext* globalCtx);
void EnOE2_Update(EnOE2* this, GlobalContext* globalCtx);
void EnOE2_Draw(EnOE2* this, GlobalContext* globalCtx);
const ActorInit En_OE2_InitVars = {
ACTOR_EN_OE2,
@ -31,18 +34,20 @@ void EnOE2_SetupAction(EnOE2* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
void EnOE2_Init(EnOE2* this, GlobalContext* globalCtx) {
void EnOE2_Init(Actor* thisx, GlobalContext* globalCtx) {
EnOE2* this = THIS;
EnOE2_SetupAction(this, func_80ABE6DC);
}
void EnOE2_Destroy(EnOE2* this, GlobalContext* globalCtx) {
void EnOE2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80ABE6DC(EnOE2* this, GlobalContext* globalCtx) {
}
void EnOE2_Update(EnOE2* this, GlobalContext* globalCtx) {
void EnOE2_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnOE2_Draw(EnOE2* this, GlobalContext* globalCtx) {
void EnOE2_Draw(Actor* thisx, GlobalContext* globalCtx) {
}