mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity

ACTOR_FLAG_11 -> ACTOR_FLAG_ENKUSA_CUT (#1065)

Browse source
This commit is contained in:
Dragorn421 2021-12-27 19:24:41 +01:00 committed by GitHub
parent 965677f014
commit 0b8edc21c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/z64actor.h
View file

@ -110,7 +110,7 @@ typedef struct {
#define ACTOR_FLAG_8 (1 << 8) #define ACTOR_FLAG_8 (1 << 8)
#define ACTOR_FLAG_9 (1 << 9) #define ACTOR_FLAG_9 (1 << 9)
#define ACTOR_FLAG_10 (1 << 10) #define ACTOR_FLAG_10 (1 << 10)
#define ACTOR_FLAG_11 (1 << 11) #define ACTOR_FLAG_ENKUSA_CUT (1 << 11)
#define ACTOR_FLAG_12 (1 << 12) #define ACTOR_FLAG_12 (1 << 12)
#define ACTOR_FLAG_13 (1 << 13) #define ACTOR_FLAG_13 (1 << 13)
#define ACTOR_FLAG_14 (1 << 14) #define ACTOR_FLAG_14 (1 << 14)

10
src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
View file

@ -276,7 +276,7 @@ void EnKusa_SetupWaitObject(EnKusa* this) {
void EnKusa_WaitObject(EnKusa* this, GlobalContext* globalCtx) { void EnKusa_WaitObject(EnKusa* this, GlobalContext* globalCtx) {
if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) {
if (this->actor.flags & ACTOR_FLAG_11) { if (this->actor.flags & ACTOR_FLAG_ENKUSA_CUT) {
EnKusa_SetupCut(this); EnKusa_SetupCut(this);
} else { } else {
EnKusa_SetupMain(this); EnKusa_SetupMain(this);
@ -315,7 +315,7 @@ void EnKusa_Main(EnKusa* this, GlobalContext* globalCtx) {
} }
EnKusa_SetupCut(this); EnKusa_SetupCut(this);
this->actor.flags |= ACTOR_FLAG_11; this->actor.flags |= ACTOR_FLAG_ENKUSA_CUT;
} else { } else {
if (!(this->collider.base.ocFlags1 & OC1_TYPE_PLAYER) && (this->actor.xzDistToPlayer > 12.0f)) { if (!(this->collider.base.ocFlags1 & OC1_TYPE_PLAYER) && (this->actor.xzDistToPlayer > 12.0f)) {
this->collider.base.ocFlags1 |= OC1_TYPE_PLAYER; this->collider.base.ocFlags1 |= OC1_TYPE_PLAYER;
@ -460,7 +460,7 @@ void EnKusa_SetupRegrow(EnKusa* this) {
EnKusa_SetupAction(this, EnKusa_Regrow); EnKusa_SetupAction(this, EnKusa_Regrow);
EnKusa_SetScaleSmall(this); EnKusa_SetScaleSmall(this);
this->actor.shape.rot = this->actor.home.rot; this->actor.shape.rot = this->actor.home.rot;
this->actor.flags &= ~ACTOR_FLAG_11; this->actor.flags &= ~ACTOR_FLAG_ENKUSA_CUT;
} }
void EnKusa_Regrow(EnKusa* this, GlobalContext* globalCtx) { void EnKusa_Regrow(EnKusa* this, GlobalContext* globalCtx) {
@ -484,7 +484,7 @@ void EnKusa_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx); this->actionFunc(this, globalCtx);
if (this->actor.flags & ACTOR_FLAG_11) { if (this->actor.flags & ACTOR_FLAG_ENKUSA_CUT) {
this->actor.shape.yOffset = -6.25f; this->actor.shape.yOffset = -6.25f;
} else { } else {
this->actor.shape.yOffset = 0.0f; this->actor.shape.yOffset = 0.0f;
@ -495,7 +495,7 @@ void EnKusa_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* dLists[] = { gFieldBushDL, object_kusa_DL_000140, object_kusa_DL_000140 }; static Gfx* dLists[] = { gFieldBushDL, object_kusa_DL_000140, object_kusa_DL_000140 };
EnKusa* this = (EnKusa*)thisx; EnKusa* this = (EnKusa*)thisx;
if (this->actor.flags & ACTOR_FLAG_11) { if (this->actor.flags & ACTOR_FLAG_ENKUSA_CUT) {
Gfx_DrawDListOpa(globalCtx, object_kusa_DL_0002E0); Gfx_DrawDListOpa(globalCtx, object_kusa_DL_0002E0);
} else { } else {
Gfx_DrawDListOpa(globalCtx, dLists[thisx->params & 3]); Gfx_DrawDListOpa(globalCtx, dLists[thisx->params & 3]);

4
src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
View file

@ -154,7 +154,7 @@ void ObjMure_SpawnActors0(ObjMure* this, GlobalContext* globalCtx) {
Actor_Spawn(ac, globalCtx, sSpawnActorIds[this->type], pos.x, pos.y, pos.z, this->actor.world.rot.x, Actor_Spawn(ac, globalCtx, sSpawnActorIds[this->type], pos.x, pos.y, pos.z, this->actor.world.rot.x,
this->actor.world.rot.y, this->actor.world.rot.z, sSpawnParams[this->type]); this->actor.world.rot.y, this->actor.world.rot.z, sSpawnParams[this->type]);
if (this->children[i] != NULL) { if (this->children[i] != NULL) {
this->children[i]->flags |= ACTOR_FLAG_11; this->children[i]->flags |= ACTOR_FLAG_ENKUSA_CUT;
this->children[i]->room = this->actor.room; this->children[i]->room = this->actor.room;
} else { } else {
osSyncPrintf("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 359); osSyncPrintf("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 359);
@ -254,7 +254,7 @@ void ObjMure_CheckChildren(ObjMure* this, GlobalContext* globalCtx) {
if (this->children[i] != NULL) { if (this->children[i] != NULL) {
if (this->childrenStates[i] == OBJMURE_CHILD_STATE_0) { if (this->childrenStates[i] == OBJMURE_CHILD_STATE_0) {
if (this->children[i]->update != NULL) { if (this->children[i]->update != NULL) {
if (this->children[i]->flags & ACTOR_FLAG_11) { if (this->children[i]->flags & ACTOR_FLAG_ENKUSA_CUT) {
this->childrenStates[i] = OBJMURE_CHILD_STATE_2; this->childrenStates[i] = OBJMURE_CHILD_STATE_2;
} }
} else { } else {