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

27
src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
View file

@ -10,8 +10,8 @@
#define FLAGS ACTOR_FLAG_5
void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjMakeoshihiki_Draw(Actor* thisx, GlobalContext* globalCtx);
void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play);
void ObjMakeoshihiki_Draw(Actor* thisx, PlayState* play);
const ActorInit Obj_Makeoshihiki_InitVars = {
ACTOR_OBJ_MAKEOSHIHIKI, ACTORCAT_PROP, FLAGS,
@ -46,16 +46,16 @@ static BlockConfig sBlocks[] = {
static u32 sFlags[3][2] = { { 0, 0 }, { 1, 0 }, { 0, 1 } };
static void (*sFlagSwitchFuncs[])(GlobalContext* globalCtx, s32 flag) = { Flags_UnsetSwitch, Flags_SetSwitch };
static void (*sFlagSwitchFuncs[])(PlayState* play, s32 flag) = { Flags_UnsetSwitch, Flags_SetSwitch };
void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx) {
void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play) {
BlockConfig* block = &sBlocks[thisx->home.rot.z & 1];
s32 typeIdx;
Vec3f* spawnPos;
if (!((thisx->params >> 6) & 1) && Flags_GetSwitch(globalCtx, thisx->params & 0x3F)) {
if (!((thisx->params >> 6) & 1) && Flags_GetSwitch(play, thisx->params & 0x3F)) {
typeIdx = 1;
} else if (!((thisx->params >> 0xE) & 1) && Flags_GetSwitch(globalCtx, (thisx->params >> 8) & 0x3F)) {
} else if (!((thisx->params >> 0xE) & 1) && Flags_GetSwitch(play, (thisx->params >> 8) & 0x3F)) {
typeIdx = 2;
} else {
typeIdx = 0;
@ -63,9 +63,8 @@ void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx) {
spawnPos = &block->posVecs[typeIdx];
if (Actor_SpawnAsChild(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y,
spawnPos->z, 0, block->rotY, 0,
((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) {
if (Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y, spawnPos->z, 0,
block->rotY, 0, ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) {
// "Push-pull block failure"
osSyncPrintf(VT_COL(RED, WHITE));
osSyncPrintf("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "../z_obj_makeoshihiki.c", 194);
@ -80,7 +79,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx) {
osSyncPrintf("(%s)(arg_data %04xF)(angleZ %d)\n", "../z_obj_makeoshihiki.c", thisx->params, thisx->home.rot.z);
}
void ObjMakeoshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) {
void ObjMakeoshihiki_Draw(Actor* thisx, PlayState* play) {
BlockConfig* block = &sBlocks[thisx->home.rot.z & 1];
s32 i;
s32 sfxCond1;
@ -94,7 +93,7 @@ void ObjMakeoshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) {
if ((thisx->params >> 6) & 1) {
sfxCond1 = false;
} else {
if (Flags_GetSwitch(globalCtx, thisx->params & 0x3F)) {
if (Flags_GetSwitch(play, thisx->params & 0x3F)) {
cond = true;
} else {
cond = false;
@ -105,7 +104,7 @@ void ObjMakeoshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) {
if ((thisx->params >> 0xE) & 1) {
sfxCond2 = false;
} else {
if (Flags_GetSwitch(globalCtx, (thisx->params >> 8) & 0x3F)) {
if (Flags_GetSwitch(play, (thisx->params >> 8) & 0x3F)) {
cond2 = true;
} else {
cond2 = false;
@ -118,8 +117,8 @@ void ObjMakeoshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
}
sFlagSwitchFuncs[sFlags[i][0]](globalCtx, thisx->params & 0x3F);
sFlagSwitchFuncs[sFlags[i][1]](globalCtx, (thisx->params >> 8) & 0x3F);
sFlagSwitchFuncs[sFlags[i][0]](play, thisx->params & 0x3F);
sFlagSwitchFuncs[sFlags[i][1]](play, (thisx->params >> 8) & 0x3F);
if (block->unk_24[i] & 2) {
((ObjOshihiki*)thisx->child)->cantMove = true;