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

36
src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
View file

@ -9,12 +9,12 @@
#define FLAGS 0
void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx);
void BgPushbox_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx);
void BgPushbox_Draw(Actor* thisx, GlobalContext* globalCtx);
void BgPushbox_Init(Actor* thisx, PlayState* play);
void BgPushbox_Destroy(Actor* thisx, PlayState* play);
void BgPushbox_Update(Actor* thisx, PlayState* play);
void BgPushbox_Draw(Actor* thisx, PlayState* play);
void BgPushbox_UpdateImpl(BgPushbox* this, GlobalContext* globalCtx);
void BgPushbox_UpdateImpl(BgPushbox* this, PlayState* play);
const ActorInit Bg_Pushbox_InitVars = {
ACTOR_BG_PUSHBOX,
@ -37,7 +37,7 @@ void BgPushbox_SetupAction(BgPushbox* this, BgPushboxActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx) {
void BgPushbox_Init(Actor* thisx, PlayState* play) {
s32 pad;
BgPushbox* this = (BgPushbox*)thisx;
CollisionHeader* colHeader = NULL;
@ -46,18 +46,18 @@ void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, DPM_UNK);
CollisionHeader_GetVirtual(&gBlockSmallCol, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
ActorShape_Init(&this->dyna.actor.shape, 0.0f, NULL, 0.0f);
BgPushbox_SetupAction(this, BgPushbox_UpdateImpl);
}
void BgPushbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void BgPushbox_Destroy(Actor* thisx, PlayState* play) {
BgPushbox* this = (BgPushbox*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
}
void BgPushbox_UpdateImpl(BgPushbox* this, GlobalContext* globalCtx) {
void BgPushbox_UpdateImpl(BgPushbox* this, PlayState* play) {
this->dyna.actor.speedXZ += this->dyna.unk_150 * 0.2f;
this->dyna.actor.speedXZ = (this->dyna.actor.speedXZ < -1.0f)
? -1.0f
@ -65,27 +65,27 @@ void BgPushbox_UpdateImpl(BgPushbox* this, GlobalContext* globalCtx) {
Math_StepToF(&this->dyna.actor.speedXZ, 0.0f, 0.2f);
this->dyna.actor.world.rot.y = this->dyna.unk_158;
Actor_MoveForward(&this->dyna.actor);
Actor_UpdateBgCheckInfo(globalCtx, &this->dyna.actor, 20.0f, 40.0f, 40.0f,
Actor_UpdateBgCheckInfo(play, &this->dyna.actor, 20.0f, 40.0f, 40.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);
}
void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgPushbox_Update(Actor* thisx, PlayState* play) {
BgPushbox* this = (BgPushbox*)thisx;
this->actionFunc(this, globalCtx);
this->actionFunc(this, play);
func_8002DF90(&this->dyna);
}
void BgPushbox_Draw(Actor* thisx, GlobalContext* globalCtx) {
void BgPushbox_Draw(Actor* thisx, PlayState* play) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 263);
OPEN_DISPS(play->state.gfxCtx, "../z_bg_pushbox.c", 263);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 269),
func_80093D18(play->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, "../z_bg_pushbox.c", 269),
G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, gBlockSmallDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272);
CLOSE_DISPS(play->state.gfxCtx, "../z_bg_pushbox.c", 272);
}

2
src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h
View file

@ -6,7 +6,7 @@
struct BgPushbox;
typedef void (*BgPushboxActionFunc)(struct BgPushbox*, GlobalContext*);
typedef void (*BgPushboxActionFunc)(struct BgPushbox*, PlayState*);
typedef struct BgPushbox {
/* 0x0000 */ DynaPolyActor dyna;