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

PlayState Rename (#1231)

Browse source 
* global context -> play

* fix PlayState* PlayState
This commit is contained in:
fig02 2022-05-21 14:23:43 -04:00 • committed by GitHub
parent 154f44b6da
commit 2e6279bc8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
912 changed files with 40489 additions and 41078 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,12 +8,12 @@
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3)
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 ItemInbox_Init(Actor* thisx, PlayState* play);
void ItemInbox_Destroy(Actor* thisx, PlayState* play);
void ItemInbox_Update(Actor* thisx, PlayState* play);
void ItemInbox_Draw(Actor* thisx, PlayState* play);
void ItemInbox_Wait(ItemInbox* this, GlobalContext* globalCtx);
void ItemInbox_Wait(ItemInbox* this, PlayState* play);
const ActorInit Item_Inbox_InitVars = {
ACTOR_ITEM_INBOX,
@ -27,32 +27,32 @@ const ActorInit Item_Inbox_InitVars = {
(ActorFunc)ItemInbox_Draw,
};
void ItemInbox_Init(Actor* thisx, GlobalContext* globalCtx) {
void ItemInbox_Init(Actor* thisx, PlayState* play) {
ItemInbox* this = (ItemInbox*)thisx;
this->actionFunc = ItemInbox_Wait;
Actor_SetScale(&this->actor, 0.2);
}
void ItemInbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void ItemInbox_Destroy(Actor* thisx, PlayState* play) {
}
void ItemInbox_Wait(ItemInbox* this, GlobalContext* globalCtx) {
if (Flags_GetTreasure(globalCtx, (this->actor.params >> 8) & 0x1F)) {
void ItemInbox_Wait(ItemInbox* this, PlayState* play) {
if (Flags_GetTreasure(play, (this->actor.params >> 8) & 0x1F)) {
Actor_Kill(&this->actor);
}
}
void ItemInbox_Update(Actor* thisx, GlobalContext* globalCtx) {
void ItemInbox_Update(Actor* thisx, PlayState* play) {
ItemInbox* this = (ItemInbox*)thisx;
this->actionFunc(this, globalCtx);
this->actionFunc(this, play);
}
void ItemInbox_Draw(Actor* thisx, GlobalContext* globalCtx) {
void ItemInbox_Draw(Actor* thisx, PlayState* play) {
ItemInbox* this = (ItemInbox*)thisx;
func_8002EBCC(&this->actor, globalCtx, 0);
func_8002ED80(&this->actor, globalCtx, 0);
GetItem_Draw(globalCtx, this->actor.params & 0xFF);
func_8002EBCC(&this->actor, play, 0);
func_8002ED80(&this->actor, play, 0);
GetItem_Draw(play, this->actor.params & 0xFF);
}

2
src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
View file

@ -6,7 +6,7 @@
struct ItemInbox;
typedef void (*ItemInboxActionFunc)(struct ItemInbox*, GlobalContext*);
typedef void (*ItemInboxActionFunc)(struct ItemInbox*, PlayState*);
typedef struct ItemInbox {
/* 0x0000 */ Actor actor;