mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-10 19:20:13 +00:00
Match z_en_dodongo.c (#1640)
This commit is contained in:
parent
88aa6de9ff
commit
0e6dc594e9
1 changed files with 2 additions and 4 deletions
|
@ -669,8 +669,6 @@ void EnDodongo_SetupDeath(EnDodongo* this, PlayState* play) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void EnDodongo_Death(EnDodongo* this, PlayState* play) {
|
void EnDodongo_Death(EnDodongo* this, PlayState* play) {
|
||||||
EnBom* bomb;
|
|
||||||
|
|
||||||
if (this->skelAnime.curFrame < 35.0f) {
|
if (this->skelAnime.curFrame < 35.0f) {
|
||||||
if (this->actor.params == EN_DODONGO_SMOKE_DEATH) {
|
if (this->actor.params == EN_DODONGO_SMOKE_DEATH) {
|
||||||
EnDodongo_SpawnBombSmoke(this, play);
|
EnDodongo_SpawnBombSmoke(this, play);
|
||||||
|
@ -680,7 +678,7 @@ void EnDodongo_Death(EnDodongo* this, PlayState* play) {
|
||||||
}
|
}
|
||||||
if (SkelAnime_Update(&this->skelAnime)) {
|
if (SkelAnime_Update(&this->skelAnime)) {
|
||||||
if (this->timer == 0) {
|
if (this->timer == 0) {
|
||||||
bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x,
|
EnBom* bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x,
|
||||||
this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 6, BOMB_BODY);
|
this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 6, BOMB_BODY);
|
||||||
if (bomb != NULL) {
|
if (bomb != NULL) {
|
||||||
bomb->timer = 0;
|
bomb->timer = 0;
|
||||||
|
|
Loading…
Reference in a new issue