mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-24 09:29:54 +00:00
Code Issues Projects Releases Wiki Activity

rematch EnGo2_StopRolling

Browse source
This commit is contained in:
feacur 2024-11-12 09:40:32 +01:00
parent b908614ceb
commit 41b9cd0487
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -1395,16 +1395,19 @@ void EnGo2_StartRolling(EnGo2* this, PlayState* play) {
void EnGo2_StopRolling(EnGo2* this, PlayState* play) { void EnGo2_StopRolling(EnGo2* this, PlayState* play) {
EnBom* bomb; EnBom* bomb;
if ((ENGO2_GET_TYPE(this) != GORON_CITY_ROLLING_BIG) && (ENGO2_GET_TYPE(this) != GORON_CITY_LINK)) { switch (ENGO2_GET_TYPE(this)) {
if (ENGO2_GET_TYPE(this) == GORON_DMT_ROLLING_SMALL) { case GORON_DMT_ROLLING_SMALL:
bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x, 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, 0, 0); this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0);
if (bomb != NULL) { if (bomb != NULL) {
bomb->timer = 0; bomb->timer = 0;
} }
} break;
} else {
this->collider.elem.acElemFlags = ACELEM_NONE; case GORON_CITY_LINK:
case GORON_CITY_ROLLING_BIG:
this->collider.elem.acElemFlags = ACELEM_NONE;
break;
} }
this->actor.shape.rot = this->actor.world.rot; this->actor.shape.rot = this->actor.world.rot;