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

52
src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
View file

@ -21,15 +21,15 @@ typedef enum {
/* 0x01 */ EXT_DRAW_VORTEX
} DemoExtDrawMode;
void DemoExt_Init(Actor* thisx, GlobalContext* globalCtx);
void DemoExt_Destroy(Actor* thisx, GlobalContext* globalCtx);
void DemoExt_Update(Actor* thisx, GlobalContext* globalCtx);
void DemoExt_Draw(Actor* thisx, GlobalContext* globalCtx);
void DemoExt_Init(Actor* thisx, PlayState* play);
void DemoExt_Destroy(Actor* thisx, PlayState* play);
void DemoExt_Update(Actor* thisx, PlayState* play);
void DemoExt_Draw(Actor* thisx, PlayState* play);
void DemoExt_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void DemoExt_Destroy(Actor* thisx, PlayState* play) {
}
void DemoExt_Init(Actor* thisx, GlobalContext* globalCtx) {
void DemoExt_Init(Actor* thisx, PlayState* play) {
DemoExt* this = (DemoExt*)thisx;
this->scrollIncr[0] = 25;
@ -50,9 +50,9 @@ void DemoExt_PlayVortexSFX(DemoExt* this) {
}
}
CsCmdActorAction* DemoExt_GetNpcAction(GlobalContext* globalCtx, s32 npcActionIndex) {
if (globalCtx->csCtx.state != CS_STATE_IDLE) {
return globalCtx->csCtx.npcActions[npcActionIndex];
CsCmdActorAction* DemoExt_GetNpcAction(PlayState* play, s32 npcActionIndex) {
if (play->csCtx.state != CS_STATE_IDLE) {
return play->csCtx.npcActions[npcActionIndex];
}
return NULL;
}
@ -62,8 +62,8 @@ void DemoExt_SetupWait(DemoExt* this) {
this->drawMode = EXT_DRAW_NOTHING;
}
void DemoExt_SetupMaintainVortex(DemoExt* this, GlobalContext* globalCtx) {
CsCmdActorAction* npcAction = DemoExt_GetNpcAction(globalCtx, 5);
void DemoExt_SetupMaintainVortex(DemoExt* this, PlayState* play) {
CsCmdActorAction* npcAction = DemoExt_GetNpcAction(play, 5);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@ -87,8 +87,8 @@ void DemoExt_FinishClosing(DemoExt* this) {
}
}
void DemoExt_CheckCsMode(DemoExt* this, GlobalContext* globalCtx) {
CsCmdActorAction* csCmdNPCAction = DemoExt_GetNpcAction(globalCtx, 5);
void DemoExt_CheckCsMode(DemoExt* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction = DemoExt_GetNpcAction(play, 5);
s32 csAction;
s32 previousCsAction;
@ -102,7 +102,7 @@ void DemoExt_CheckCsMode(DemoExt* this, GlobalContext* globalCtx) {
DemoExt_SetupWait(this);
break;
case 2:
DemoExt_SetupMaintainVortex(this, globalCtx);
DemoExt_SetupMaintainVortex(this, play);
break;
case 3:
DemoExt_SetupDispellVortex(this);
@ -144,17 +144,17 @@ void DemoExt_SetColorsAndScales(DemoExt* this) {
scale->z = (kREG(21) + 400.0f) * shrinkFactor;
}
void DemoExt_Wait(DemoExt* this, GlobalContext* globalCtx) {
DemoExt_CheckCsMode(this, globalCtx);
void DemoExt_Wait(DemoExt* this, PlayState* play) {
DemoExt_CheckCsMode(this, play);
}
void DemoExt_MaintainVortex(DemoExt* this, GlobalContext* globalCtx) {
void DemoExt_MaintainVortex(DemoExt* this, PlayState* play) {
DemoExt_PlayVortexSFX(this);
DemoExt_SetScrollAndRotation(this);
DemoExt_CheckCsMode(this, globalCtx);
DemoExt_CheckCsMode(this, play);
}
void DemoExt_DispellVortex(DemoExt* this, GlobalContext* globalCtx) {
void DemoExt_DispellVortex(DemoExt* this, PlayState* play) {
DemoExt_PlayVortexSFX(this);
DemoExt_SetScrollAndRotation(this);
DemoExt_SetColorsAndScales(this);
@ -167,21 +167,21 @@ static DemoExtActionFunc sActionFuncs[] = {
DemoExt_DispellVortex,
};
void DemoExt_Update(Actor* thisx, GlobalContext* globalCtx) {
void DemoExt_Update(Actor* thisx, PlayState* play) {
DemoExt* this = (DemoExt*)thisx;
if ((this->action < EXT_WAIT) || (this->action > EXT_DISPELL) || sActionFuncs[this->action] == NULL) {
// "Main mode is abnormal!"
osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
} else {
sActionFuncs[this->action](this, globalCtx);
sActionFuncs[this->action](this, play);
}
}
void DemoExt_DrawNothing(Actor* thisx, GlobalContext* globalCtx) {
void DemoExt_DrawNothing(Actor* thisx, PlayState* play) {
}
void DemoExt_DrawVortex(Actor* thisx, GlobalContext* globalCtx) {
void DemoExt_DrawVortex(Actor* thisx, PlayState* play) {
DemoExt* this = (DemoExt*)thisx;
Mtx* mtx;
GraphicsContext* gfxCtx;
@ -189,7 +189,7 @@ void DemoExt_DrawVortex(Actor* thisx, GlobalContext* globalCtx) {
Vec3f* scale;
scale = &this->scale;
gfxCtx = globalCtx->state.gfxCtx;
gfxCtx = play->state.gfxCtx;
mtx = Graph_Alloc(gfxCtx, sizeof(Mtx));
OPEN_DISPS(gfxCtx, "../z_demo_ext.c", 460);
@ -221,7 +221,7 @@ static DemoExtDrawFunc sDrawFuncs[] = {
DemoExt_DrawVortex,
};
void DemoExt_Draw(Actor* thisx, GlobalContext* globalCtx) {
void DemoExt_Draw(Actor* thisx, PlayState* play) {
DemoExt* this = (DemoExt*)thisx;
if ((this->drawMode < EXT_DRAW_NOTHING) || (this->drawMode > EXT_DRAW_VORTEX) ||
@ -229,7 +229,7 @@ void DemoExt_Draw(Actor* thisx, GlobalContext* globalCtx) {
// "Draw mode is abnormal!"
osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
} else {
sDrawFuncs[this->drawMode](thisx, globalCtx);
sDrawFuncs[this->drawMode](thisx, play);
}
}

4
src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h
View file

@ -6,8 +6,8 @@
struct DemoExt;
typedef void (*DemoExtActionFunc)(struct DemoExt*, GlobalContext*);
typedef void (*DemoExtDrawFunc)(Actor*, GlobalContext*);
typedef void (*DemoExtActionFunc)(struct DemoExt*, PlayState*);
typedef void (*DemoExtDrawFunc)(Actor*, PlayState*);
typedef struct DemoExt {
/* 0x0000 */ Actor actor;