mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-22 23:26:58 +00:00
Code Issues Projects Releases Wiki Activity

rematch EnGo2_RollingSlow

Browse source
This commit is contained in:
feacur 2024-11-13 13:28:59 +01:00
parent 7f3642d522
commit 77fde2c89b
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1772,7 +1772,6 @@ void EnGo2_RollingStart(EnGo2* this, PlayState* play) {
void EnGo2_RollingSlow(EnGo2* this, PlayState* play) { void EnGo2_RollingSlow(EnGo2* this, PlayState* play) {
s32 updatedWaypoint; s32 updatedWaypoint;
s32 index;
if (!EnGo2_IsRolling(this)) { if (!EnGo2_IsRolling(this)) {
if (EnGo2_IsRollingOnGround(this, 4, 8.0f, 1) == true) { if (EnGo2_IsRollingOnGround(this, 4, 8.0f, 1) == true) {
@ -1783,16 +1782,20 @@ void EnGo2_RollingSlow(EnGo2* this, PlayState* play) {
EnGo2_SpawnDust(this, 3); EnGo2_SpawnDust(this, 3);
} }
updatedWaypoint = EnGo2_FollowPath(this, play); updatedWaypoint = EnGo2_FollowPath(this, play);
index = ENGO2_GET_TYPE(this); switch (ENGO2_GET_TYPE(this)) {
if (index != GORON_CITY_LINK) { case GORON_DMT_ROLLING_SMALL:
if ((index == GORON_DMT_ROLLING_SMALL) && (updatedWaypoint == 1) && (this->waypoint == 0)) { if ((updatedWaypoint == 1) && (this->waypoint == 0)) {
EnGo2_StopRolling(this, play); EnGo2_StopRolling(this, play);
return; return;
} }
} else if ((updatedWaypoint == 2) && (this->waypoint == 1)) { break;
// @unreachable: `EnGo2_FollowPath` returns `0` or `1` case GORON_CITY_LINK:
EnGo2_StopRolling(this, play); if ((updatedWaypoint == 2) && (this->waypoint == 1)) {
return; // @unreachable: `EnGo2_FollowPath` returns `0` or `1`
EnGo2_StopRolling(this, play);
return;
}
break;
} }
Math_ApproachF(&this->actor.speed, EnGo2_GetTargetXZSpeed(this), 0.4f, 0.6f); Math_ApproachF(&this->actor.speed, EnGo2_GetTargetXZSpeed(this), 0.4f, 0.6f);
this->actor.shape.rot = this->actor.world.rot; this->actor.shape.rot = this->actor.world.rot;