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

25
src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c
View file

@ -8,11 +8,14 @@
#define FLAGS 0x00000009
void ItemInbox_Init(ItemInbox* this, GlobalContext* globalCtx);
void ItemInbox_Destroy(ItemInbox* this, GlobalContext* globalCtx);
#define THIS ((ItemInbox*)thisx)
void ItemInbox_Init(Actor* thisx, GlobalContext* globalCtx);
void ItemInbox_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ItemInbox_Update(Actor* thisx, GlobalContext* globalCtx);
void ItemInbox_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80B86020(ItemInbox* this, GlobalContext* globalCtx);
void ItemInbox_Update(ItemInbox* this, GlobalContext* globalCtx);
void ItemInbox_Draw(ItemInbox* this, GlobalContext* globalCtx);
const ActorInit Item_Inbox_InitVars = {
ACTOR_ITEM_INBOX,
@ -26,12 +29,14 @@ const ActorInit Item_Inbox_InitVars = {
(ActorFunc)ItemInbox_Draw,
};
void ItemInbox_Init(ItemInbox* this, GlobalContext* globalCtx) {
void ItemInbox_Init(Actor* thisx, GlobalContext* globalCtx) {
ItemInbox* this = THIS;
this->actionFunc = func_80B86020;
Actor_SetScale(&this->actor, 0.2);
}
void ItemInbox_Destroy(ItemInbox* this, GlobalContext* globalCtx) {
void ItemInbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80B86020(ItemInbox* this, GlobalContext* globalCtx) {
@ -40,11 +45,15 @@ void func_80B86020(ItemInbox* this, GlobalContext* globalCtx) {
}
}
void ItemInbox_Update(ItemInbox* this, GlobalContext* globalCtx) {
void ItemInbox_Update(Actor* thisx, GlobalContext* globalCtx) {
ItemInbox* this = THIS;
this->actionFunc(this, globalCtx);
}
void ItemInbox_Draw(ItemInbox* this, GlobalContext* globalCtx) {
void ItemInbox_Draw(Actor* thisx, GlobalContext* globalCtx) {
ItemInbox* this = THIS;
func_8002EBCC(&this->actor, globalCtx, 0);
func_8002ED80(&this->actor, globalCtx, 0);
func_800694A0(globalCtx, this->actor.params & 0xFF);