mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-17 22:02:19 -05:00
Code Issues Projects Releases Wiki Activity

Rename bomb flower fuse setting field (decomp) (#4653)

Browse Source
This commit is contained in:
Jordan Longstaff 2024-12-09 11:13:28 -05:00 committed by GitHub
parent 2d37098379
commit 4010229de5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
View File

@ -91,7 +91,7 @@ void EnBombf_Init(Actor* thisx, PlayState* play) {
EnBombf* this = (EnBombf*)thisx; EnBombf* this = (EnBombf*)thisx;
Actor_SetScale(thisx, 0.01f); Actor_SetScale(thisx, 0.01f);
this->unk_200 = 1; this->isFuseEnabled = 1;
Collider_InitCylinder(play, &this->bombCollider); Collider_InitCylinder(play, &this->bombCollider);
Collider_InitJntSph(play, &this->explosionCollider); Collider_InitJntSph(play, &this->explosionCollider);
Collider_SetCylinder(play, &this->bombCollider, thisx, &sCylinderInit); Collider_SetCylinder(play, &this->bombCollider, thisx, &sCylinderInit);
@ -174,7 +174,7 @@ void EnBombf_GrowBomb(EnBombf* this, PlayState* play) {
(EnBombf*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOMBF, this->actor.world.pos.x, (EnBombf*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOMBF, this->actor.world.pos.x,
this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true); this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0, true);
if (bombFlower != NULL) { if (bombFlower != NULL) {
bombFlower->unk_200 = 1; bombFlower->isFuseEnabled = 1;
bombFlower->timer = 0; bombFlower->timer = 0;
this->timer = 180; this->timer = 180;
this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
@ -323,7 +323,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) {
s32 pad[2]; s32 pad[2];
EnBombf* this = (EnBombf*)thisx; EnBombf* this = (EnBombf*)thisx;
if ((this->unk_200 != 0) && (this->timer != 0)) { if ((this->isFuseEnabled != 0) && (this->timer != 0)) {
this->timer--; this->timer--;
} }
@ -367,7 +367,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) {
if ((this->bombCollider.base.acFlags & AC_HIT) || ((this->bombCollider.base.ocFlags1 & OC1_HIT) && if ((this->bombCollider.base.acFlags & AC_HIT) || ((this->bombCollider.base.ocFlags1 & OC1_HIT) &&
(this->bombCollider.base.oc->category == ACTORCAT_ENEMY))) { (this->bombCollider.base.oc->category == ACTORCAT_ENEMY))) {
this->unk_200 = 1; this->isFuseEnabled = 1;
this->timer = 0; this->timer = 0;
} else { } else {
// if a lit stick touches the bomb, set timer to 100 // if a lit stick touches the bomb, set timer to 100
@ -376,7 +376,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) {
} }
} }
if (this->unk_200 != 0) { if (this->isFuseEnabled != 0) {
dustAccel.y = 0.2f; dustAccel.y = 0.2f;
effPos = thisx->world.pos; effPos = thisx->world.pos;
effPos.y += 25.0f; effPos.y += 25.0f;

2
soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
View File

@ -15,7 +15,7 @@ typedef struct EnBombf {
/* 0x01B8 */ ColliderJntSphElement explosionColliderItems[1]; /* 0x01B8 */ ColliderJntSphElement explosionColliderItems[1];
/* 0x01F8 */ s16 timer; /* 0x01F8 */ s16 timer;
/* 0x01FC */ EnBombfActionFunc actionFunc; /* 0x01FC */ EnBombfActionFunc actionFunc;
/* 0x0200 */ s32 unk_200; /* 0x0200 */ s32 isFuseEnabled;
/* 0x0204 */ u8 bumpOn; /* 0x0204 */ u8 bumpOn;
/* 0x0206 */ s16 flashSpeedScale; /* 0x0206 */ s16 flashSpeedScale;
/* 0x0208 */ f32 flashIntensity; /* 0x0208 */ f32 flashIntensity;