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

69
src/overlays/actors/ovl_En_Mu/z_en_mu.c
View file

@ -9,13 +9,13 @@
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3)
void EnMu_Init(Actor* thisx, GlobalContext* globalCtx);
void EnMu_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnMu_Update(Actor* thisx, GlobalContext* globalCtx);
void EnMu_Draw(Actor* thisx, GlobalContext* globalCtx);
void EnMu_Init(Actor* thisx, PlayState* play);
void EnMu_Destroy(Actor* thisx, PlayState* play);
void EnMu_Update(Actor* thisx, PlayState* play);
void EnMu_Draw(Actor* thisx, PlayState* play);
void EnMu_Pose(EnMu* this, GlobalContext* globalCtx);
s16 EnMu_CheckDialogState(GlobalContext* globalCtx, Actor* thisx);
void EnMu_Pose(EnMu* this, PlayState* play);
s16 EnMu_CheckDialogState(PlayState* play, Actor* thisx);
static ColliderCylinderInit D_80AB0BD0 = {
{
@ -55,7 +55,7 @@ void EnMu_SetupAction(EnMu* this, EnMuActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
void EnMu_Interact(EnMu* this, GlobalContext* globalCtx) {
void EnMu_Interact(EnMu* this, PlayState* play) {
u8 textIdOffset[] = { 0x42, 0x43, 0x3F, 0x41, 0x3E };
u8 bitmask[] = {
EVENTINF_20_MASK, EVENTINF_21_MASK, EVENTINF_22_MASK, EVENTINF_23_MASK, EVENTINF_24_MASK,
@ -68,7 +68,7 @@ void EnMu_Interact(EnMu* this, GlobalContext* globalCtx) {
(EVENTINF_20_MASK | EVENTINF_21_MASK | EVENTINF_22_MASK | EVENTINF_23_MASK | EVENTINF_24_MASK);
gSaveContext.eventInf[EVENTINF_20_21_22_23_24_INDEX] &=
~(EVENTINF_20_MASK | EVENTINF_21_MASK | EVENTINF_22_MASK | EVENTINF_23_MASK | EVENTINF_24_MASK);
randomIndex = (globalCtx->state.frames + (s32)(Rand_ZeroOne() * 5.0f)) % 5;
randomIndex = (play->state.frames + (s32)(Rand_ZeroOne() * 5.0f)) % 5;
for (i = 0; i < 5; i++) {
@ -98,9 +98,9 @@ void EnMu_Interact(EnMu* this, GlobalContext* globalCtx) {
gSaveContext.eventInf[EVENTINF_20_21_22_23_24_INDEX] |= textFlags;
}
u16 EnMu_GetFaceReaction(GlobalContext* globalCtx, Actor* thisx) {
u16 EnMu_GetFaceReaction(PlayState* play, Actor* thisx) {
EnMu* this = (EnMu*)thisx;
u16 faceReaction = Text_GetFaceReaction(globalCtx, this->actor.params + 0x3A);
u16 faceReaction = Text_GetFaceReaction(play, this->actor.params + 0x3A);
if (faceReaction != 0) {
return faceReaction;
@ -108,10 +108,10 @@ u16 EnMu_GetFaceReaction(GlobalContext* globalCtx, Actor* thisx) {
return this->defFaceReaction;
}
s16 EnMu_CheckDialogState(GlobalContext* globalCtx, Actor* thisx) {
s16 EnMu_CheckDialogState(PlayState* play, Actor* thisx) {
EnMu* this = (EnMu*)thisx;
switch (Message_GetState(&globalCtx->msgCtx)) {
switch (Message_GetState(&play->msgCtx)) {
case TEXT_STATE_NONE:
case TEXT_STATE_DONE_HAS_NEXT:
case TEXT_STATE_DONE_FADING:
@ -123,39 +123,39 @@ s16 EnMu_CheckDialogState(GlobalContext* globalCtx, Actor* thisx) {
case TEXT_STATE_9:
return 1;
case TEXT_STATE_CLOSING:
EnMu_Interact(this, globalCtx);
EnMu_Interact(this, play);
return 0;
default:
return 1;
}
}
void EnMu_Init(Actor* thisx, GlobalContext* globalCtx) {
void EnMu_Init(Actor* thisx, PlayState* play) {
EnMu* this = (EnMu*)thisx;
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 160.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_mu_Skel_004F70, &object_mu_Anim_0003F4, NULL, NULL, 0);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &D_80AB0BD0);
SkelAnime_InitFlex(play, &this->skelAnime, &object_mu_Skel_004F70, &object_mu_Anim_0003F4, NULL, NULL, 0);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &D_80AB0BD0);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &D_80AB0BFC);
this->actor.targetMode = 6;
Actor_SetScale(&this->actor, 0.01f);
EnMu_Interact(this, globalCtx);
EnMu_Interact(this, play);
EnMu_SetupAction(this, EnMu_Pose);
}
void EnMu_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EnMu_Destroy(Actor* thisx, PlayState* play) {
EnMu* this = (EnMu*)thisx;
SkelAnime_Free(&this->skelAnime, globalCtx);
SkelAnime_Free(&this->skelAnime, play);
}
void EnMu_Pose(EnMu* this, GlobalContext* globalCtx) {
func_80034F54(globalCtx, this->unk_20A, this->unk_22A, 16);
void EnMu_Pose(EnMu* this, PlayState* play) {
func_80034F54(play, this->unk_20A, this->unk_22A, 16);
}
void EnMu_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnMu_Update(Actor* thisx, PlayState* play) {
EnMu* this = (EnMu*)thisx;
s32 pad;
f32 talkDist;
@ -167,19 +167,18 @@ void EnMu_Update(Actor* thisx, GlobalContext* globalCtx) {
this->collider.dim.pos = pos;
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
SkelAnime_Update(&this->skelAnime);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
this->actionFunc(this, globalCtx);
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
this->actionFunc(this, play);
talkDist = this->collider.dim.radius + 30.0f;
func_800343CC(globalCtx, &this->actor, &this->npcInfo.unk_00, talkDist, EnMu_GetFaceReaction,
EnMu_CheckDialogState);
func_800343CC(play, &this->actor, &this->npcInfo.unk_00, talkDist, EnMu_GetFaceReaction, EnMu_CheckDialogState);
this->actor.focus.pos = this->actor.world.pos;
this->actor.focus.pos.y += 60.0f;
}
s32 EnMu_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
s32 EnMu_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnMu* this = (EnMu*)thisx;
if ((limbIndex == 5) || (limbIndex == 6) || (limbIndex == 7) || (limbIndex == 11) || (limbIndex == 12) ||
@ -190,7 +189,7 @@ s32 EnMu_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
return false;
}
void EnMu_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
void EnMu_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
}
Gfx* EnMu_DisplayListSetColor(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b, u8 a) {
@ -202,7 +201,7 @@ Gfx* EnMu_DisplayListSetColor(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b, u8 a) {
return dlist;
}
void EnMu_Draw(Actor* thisx, GlobalContext* globalCtx) {
void EnMu_Draw(Actor* thisx, PlayState* play) {
EnMu* this = (EnMu*)thisx;
Color_RGBA8 colors[2][5] = {
{ { 100, 130, 235, 0 }, { 160, 250, 60, 0 }, { 90, 60, 20, 0 }, { 30, 240, 200, 0 }, { 140, 70, 20, 0 } },
@ -211,15 +210,15 @@ void EnMu_Draw(Actor* thisx, GlobalContext* globalCtx) {
u8 segmentId[] = { 0x08, 0x09, 0x0A, 0x0B, 0x0C };
s32 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_mu.c", 514);
OPEN_DISPS(play->state.gfxCtx, "../z_en_mu.c", 514);
Matrix_Translate(-1200.0f, 0.0f, -1400.0f, MTXMODE_APPLY);
for (i = 0; i < 5; i++) {
gSPSegment(POLY_OPA_DISP++, segmentId[i],
EnMu_DisplayListSetColor(globalCtx->state.gfxCtx, colors[this->actor.params][i].r,
EnMu_DisplayListSetColor(play->state.gfxCtx, colors[this->actor.params][i].r,
colors[this->actor.params][i].g, colors[this->actor.params][i].b,
colors[this->actor.params][i].a));
}
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnMu_OverrideLimbDraw, EnMu_PostLimbDraw, this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_mu.c", 534);
CLOSE_DISPS(play->state.gfxCtx, "../z_en_mu.c", 534);
}

2
src/overlays/actors/ovl_En_Mu/z_en_mu.h
View file

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