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

100
src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
View file

@ -8,19 +8,19 @@
#define FLAGS ACTOR_FLAG_4
void ItemEtcetera_Init(Actor* thisx, GlobalContext* globalCtx);
void ItemEtcetera_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ItemEtcetera_Update(Actor* thisx, GlobalContext* globalCtx);
void ItemEtcetera_DrawThroughLens(Actor* thisx, GlobalContext* globalCtx);
void ItemEtcetera_Draw(Actor* thisx, GlobalContext* globalCtx);
void ItemEtcetera_Init(Actor* thisx, PlayState* play);
void ItemEtcetera_Destroy(Actor* thisx, PlayState* play);
void ItemEtcetera_Update(Actor* thisx, PlayState* play);
void ItemEtcetera_DrawThroughLens(Actor* thisx, PlayState* play);
void ItemEtcetera_Draw(Actor* thisx, PlayState* play);
void func_80B857D0(ItemEtcetera* this, GlobalContext* globalCtx);
void func_80B85824(ItemEtcetera* this, GlobalContext* globalCtx);
void func_80B858B4(ItemEtcetera* this, GlobalContext* globalCtx);
void ItemEtcetera_SpawnSparkles(ItemEtcetera* this, GlobalContext* globalCtx);
void ItemEtcetera_MoveFireArrowDown(ItemEtcetera* this, GlobalContext* globalCtx);
void func_80B85B28(ItemEtcetera* this, GlobalContext* globalCtx);
void ItemEtcetera_UpdateFireArrow(ItemEtcetera* this, GlobalContext* globalCtx);
void func_80B857D0(ItemEtcetera* this, PlayState* play);
void func_80B85824(ItemEtcetera* this, PlayState* play);
void func_80B858B4(ItemEtcetera* this, PlayState* play);
void ItemEtcetera_SpawnSparkles(ItemEtcetera* this, PlayState* play);
void ItemEtcetera_MoveFireArrowDown(ItemEtcetera* this, PlayState* play);
void func_80B85B28(ItemEtcetera* this, PlayState* play);
void ItemEtcetera_UpdateFireArrow(ItemEtcetera* this, PlayState* play);
const ActorInit Item_Etcetera_InitVars = {
ACTOR_ITEM_ETCETERA,
@ -56,7 +56,7 @@ void ItemEtcetera_SetupAction(ItemEtcetera* this, ItemEtceteraActionFunc actionF
this->actionFunc = actionFunc;
}
void ItemEtcetera_Init(Actor* thisx, GlobalContext* globalCtx) {
void ItemEtcetera_Init(Actor* thisx, PlayState* play) {
ItemEtcetera* this = (ItemEtcetera*)thisx;
s32 pad;
s32 type;
@ -64,7 +64,7 @@ void ItemEtcetera_Init(Actor* thisx, GlobalContext* globalCtx) {
type = this->actor.params & 0xFF;
osSyncPrintf("no = %d\n", type);
objBankIndex = Object_GetIndex(&globalCtx->objectCtx, sObjectIds[type]);
objBankIndex = Object_GetIndex(&play->objectCtx, sObjectIds[type]);
osSyncPrintf("bank_ID = %d\n", objBankIndex);
if (objBankIndex < 0) {
ASSERT(0, "0", "../z_item_etcetera.c", 241);
@ -105,46 +105,46 @@ void ItemEtcetera_Init(Actor* thisx, GlobalContext* globalCtx) {
}
}
void ItemEtcetera_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void ItemEtcetera_Destroy(Actor* thisx, PlayState* play) {
}
void func_80B857D0(ItemEtcetera* this, GlobalContext* globalCtx) {
if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) {
void func_80B857D0(ItemEtcetera* this, PlayState* play) {
if (Object_IsLoaded(&play->objectCtx, this->objBankIndex)) {
this->actor.objBankIndex = this->objBankIndex;
this->actor.draw = this->drawFunc;
this->actionFunc = this->futureActionFunc;
}
}
void func_80B85824(ItemEtcetera* this, GlobalContext* globalCtx) {
if (Actor_HasParent(&this->actor, globalCtx)) {
void func_80B85824(ItemEtcetera* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
if ((this->actor.params & 0xFF) == 1) {
SET_EVENTCHKINF(EVENTCHKINF_31);
Flags_SetSwitch(globalCtx, 0xB);
Flags_SetSwitch(play, 0xB);
}
Actor_Kill(&this->actor);
} else {
func_8002F434(&this->actor, globalCtx, this->getItemId, 30.0f, 50.0f);
func_8002F434(&this->actor, play, this->getItemId, 30.0f, 50.0f);
}
}
void func_80B858B4(ItemEtcetera* this, GlobalContext* globalCtx) {
if (Actor_HasParent(&this->actor, globalCtx)) {
void func_80B858B4(ItemEtcetera* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
if ((this->actor.params & 0xFF) == 1) {
SET_EVENTCHKINF(EVENTCHKINF_31);
Flags_SetSwitch(globalCtx, 0xB);
Flags_SetSwitch(play, 0xB);
}
Actor_Kill(&this->actor);
} else {
if (0) {} // Necessary to match
func_8002F434(&this->actor, globalCtx, this->getItemId, 30.0f, 50.0f);
if ((globalCtx->gameplayFrames & 0xD) == 0) {
EffectSsBubble_Spawn(globalCtx, &this->actor.world.pos, 0.0f, 0.0f, 10.0f, 0.13f);
func_8002F434(&this->actor, play, this->getItemId, 30.0f, 50.0f);
if ((play->gameplayFrames & 0xD) == 0) {
EffectSsBubble_Spawn(play, &this->actor.world.pos, 0.0f, 0.0f, 10.0f, 0.13f);
}
}
}
void ItemEtcetera_SpawnSparkles(ItemEtcetera* this, GlobalContext* globalCtx) {
void ItemEtcetera_SpawnSparkles(ItemEtcetera* this, PlayState* play) {
static Vec3f velocity = { 0.0f, 0.2f, 0.0f };
static Vec3f accel = { 0.0f, 0.05f, 0.0f };
static Color_RGBA8 primColor = { 255, 255, 255, 0 };
@ -158,30 +158,30 @@ void ItemEtcetera_SpawnSparkles(ItemEtcetera* this, GlobalContext* globalCtx) {
pos.x = Rand_CenteredFloat(12.0f) + this->actor.world.pos.x;
pos.y = (Rand_ZeroOne() * 6.0f) + this->actor.world.pos.y;
pos.z = Rand_CenteredFloat(12.0f) + this->actor.world.pos.z;
EffectSsKiraKira_SpawnDispersed(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, 5000, 16);
EffectSsKiraKira_SpawnDispersed(play, &pos, &velocity, &accel, &primColor, &envColor, 5000, 16);
}
void ItemEtcetera_MoveFireArrowDown(ItemEtcetera* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 10.0f, 10.0f, 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
void ItemEtcetera_MoveFireArrowDown(ItemEtcetera* this, PlayState* play) {
Actor_UpdateBgCheckInfo(play, &this->actor, 10.0f, 10.0f, 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
Actor_MoveForward(&this->actor);
if (!(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) {
ItemEtcetera_SpawnSparkles(this, globalCtx);
ItemEtcetera_SpawnSparkles(this, play);
}
this->actor.shape.rot.y += 0x400;
func_80B85824(this, globalCtx);
func_80B85824(this, play);
}
void func_80B85B28(ItemEtcetera* this, GlobalContext* globalCtx) {
if (Flags_GetTreasure(globalCtx, (this->actor.params >> 8) & 0x1F)) {
void func_80B85B28(ItemEtcetera* this, PlayState* play) {
if (Flags_GetTreasure(play, (this->actor.params >> 8) & 0x1F)) {
Actor_Kill(&this->actor);
}
}
void ItemEtcetera_UpdateFireArrow(ItemEtcetera* this, GlobalContext* globalCtx) {
if ((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[0] != NULL)) {
LOG_NUM("(game_play->demo_play.npcdemopnt[0]->dousa)", globalCtx->csCtx.npcActions[0]->action,
void ItemEtcetera_UpdateFireArrow(ItemEtcetera* this, PlayState* play) {
if ((play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.npcActions[0] != NULL)) {
LOG_NUM("(game_play->demo_play.npcdemopnt[0]->dousa)", play->csCtx.npcActions[0]->action,
"../z_item_etcetera.c", 441);
if (globalCtx->csCtx.npcActions[0]->action == 2) {
if (play->csCtx.npcActions[0]->action == 2) {
this->actor.draw = ItemEtcetera_Draw;
this->actor.gravity = -0.1f;
this->actor.minVelocityY = -4.0f;
@ -194,24 +194,24 @@ void ItemEtcetera_UpdateFireArrow(ItemEtcetera* this, GlobalContext* globalCtx)
}
}
void ItemEtcetera_Update(Actor* thisx, GlobalContext* globalCtx) {
void ItemEtcetera_Update(Actor* thisx, PlayState* play) {
ItemEtcetera* this = (ItemEtcetera*)thisx;
this->actionFunc(this, globalCtx);
this->actionFunc(this, play);
}
void ItemEtcetera_DrawThroughLens(Actor* thisx, GlobalContext* globalCtx) {
void ItemEtcetera_DrawThroughLens(Actor* thisx, PlayState* play) {
ItemEtcetera* this = (ItemEtcetera*)thisx;
if (globalCtx->actorCtx.lensActive) {
func_8002EBCC(&this->actor, globalCtx, 0);
func_8002ED80(&this->actor, globalCtx, 0);
GetItem_Draw(globalCtx, this->giDrawId);
if (play->actorCtx.lensActive) {
func_8002EBCC(&this->actor, play, 0);
func_8002ED80(&this->actor, play, 0);
GetItem_Draw(play, this->giDrawId);
}
}
void ItemEtcetera_Draw(Actor* thisx, GlobalContext* globalCtx) {
void ItemEtcetera_Draw(Actor* thisx, PlayState* play) {
ItemEtcetera* this = (ItemEtcetera*)thisx;
func_8002EBCC(&this->actor, globalCtx, 0);
func_8002ED80(&this->actor, globalCtx, 0);
GetItem_Draw(globalCtx, this->giDrawId);
func_8002EBCC(&this->actor, play, 0);
func_8002ED80(&this->actor, play, 0);
GetItem_Draw(play, this->giDrawId);
}

2
src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
View file

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