mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +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_En_Lightbox/z_en_lightbox.c
View file

@ -9,10 +9,10 @@
#define FLAGS ACTOR_FLAG_4
void EnLightbox_Init(Actor* thisx, GlobalContext* globalCtx);
void EnLightbox_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx);
void EnLightbox_Draw(Actor* thisx, GlobalContext* globalCtx);
void EnLightbox_Init(Actor* thisx, PlayState* play);
void EnLightbox_Destroy(Actor* thisx, PlayState* play);
void EnLightbox_Update(Actor* thisx, PlayState* play);
void EnLightbox_Draw(Actor* thisx, PlayState* play);
const ActorInit En_Lightbox_InitVars = {
ACTOR_EN_LIGHTBOX,
@ -26,7 +26,7 @@ const ActorInit En_Lightbox_InitVars = {
(ActorFunc)EnLightbox_Draw,
};
void EnLightbox_Init(Actor* thisx, GlobalContext* globalCtx) {
void EnLightbox_Init(Actor* thisx, PlayState* play) {
CollisionHeader* colHeader = NULL;
EnLightbox* this = (EnLightbox*)thisx;
s32 pad[4];
@ -56,24 +56,24 @@ void EnLightbox_Init(Actor* thisx, GlobalContext* globalCtx) {
thisx->targetMode = 0;
thisx->gravity = -2.0f;
CollisionHeader_GetVirtual(&object_lightbox_Col_001F10, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader);
}
void EnLightbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EnLightbox_Destroy(Actor* thisx, PlayState* play) {
EnLightbox* this = (EnLightbox*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
}
void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnLightbox_Update(Actor* thisx, PlayState* play) {
EnLightbox* this = (EnLightbox*)thisx;
if (this->dyna.unk_162 != 0) {
if (Actor_HasNoParent(thisx, globalCtx)) {
if (Actor_HasNoParent(thisx, play)) {
this->dyna.unk_162 = 0;
}
} else {
if (Actor_HasParent(thisx, globalCtx)) {
if (Actor_HasParent(thisx, play)) {
this->dyna.unk_162++;
} else {
if (thisx->speedXZ) {
@ -96,18 +96,18 @@ void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) {
thisx->velocity.y *= IREG(60) / 100.0f;
thisx->bgCheckFlags &= ~BGCHECKFLAG_GROUND;
} else {
func_8002F580(thisx, globalCtx);
func_8002F580(thisx, play);
}
}
}
}
Actor_MoveForward(thisx);
Actor_UpdateBgCheckInfo(
globalCtx, thisx, thisx->colChkInfo.cylHeight, thisx->colChkInfo.cylRadius, thisx->colChkInfo.cylRadius,
play, thisx, thisx->colChkInfo.cylHeight, thisx->colChkInfo.cylRadius, thisx->colChkInfo.cylRadius,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | UPDBGCHECKINFO_FLAG_4);
thisx->focus.pos = thisx->world.pos;
}
void EnLightbox_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, object_lightbox_DL_000B70);
void EnLightbox_Draw(Actor* thisx, PlayState* play) {
Gfx_DrawDListOpa(play, object_lightbox_DL_000B70);
}