nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix infinite search for pos (#35)

Browse Source
This commit is contained in:
Garrett Cox
2025-12-06 16:34:10 -06:00
committed by GitHub
parent edbef01749
commit 1aa04eeee1
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
soh/soh/Enhancements/Holiday/Fredomato.cpp
View File

@@ -127,7 +127,9 @@ static void RandomGrotto_Draw(Actor* actor, PlayState* play) {
static Vec3f FindValidPos(f32 distance) { static Vec3f FindValidPos(f32 distance) {
Vec3f pos; Vec3f pos;
pos.y = 9999.0f; pos.y = 9999.0f;
while (true) { int attempts = 0;
while (attempts++ < 20) {
if (GET_PLAYER(gPlayState) != nullptr) { if (GET_PLAYER(gPlayState) != nullptr) {
pos.x = GET_PLAYER(gPlayState)->actor.world.pos.x; pos.x = GET_PLAYER(gPlayState)->actor.world.pos.x;
pos.z = GET_PLAYER(gPlayState)->actor.world.pos.z; pos.z = GET_PLAYER(gPlayState)->actor.world.pos.z;
@@ -156,6 +158,10 @@ static void SpawnRandomGrotto() {
} }
Vec3f pos = FindValidPos(2000.0f); Vec3f pos = FindValidPos(2000.0f);
if (pos.y == 9999.0f) {
return;
}
Actor* grotto = Actor* grotto =
Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_ANA, pos.x, pos.y, pos.z, 0, 0, 0, 0, false); Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_DOOR_ANA, pos.x, pos.y, pos.z, 0, 0, 0, 0, false);
midoGrottoInit = false; midoGrottoInit = false;
@@ -374,6 +380,10 @@ void RandomTrap_Draw(Actor* actor, PlayState* play) {
void SpawnRandomTrap() { void SpawnRandomTrap() {
Vec3f pos = FindValidPos(2000.0f); Vec3f pos = FindValidPos(2000.0f);
if (pos.y == 9999.0f) {
return;
}
EnItem00* randomTrap = CustomItem::Spawn(pos.x, pos.y, pos.z, 0, CustomItem::TOSS_ON_SPAWN, 0, NULL, NULL); EnItem00* randomTrap = CustomItem::Spawn(pos.x, pos.y, pos.z, 0, CustomItem::TOSS_ON_SPAWN, 0, NULL, NULL);
SoundSource_PlaySfxAtFixedWorldPos(gPlayState, &randomTrap->actor.world.pos, 20, NA_SE_EV_LIGHTNING); SoundSource_PlaySfxAtFixedWorldPos(gPlayState, &randomTrap->actor.world.pos, 20, NA_SE_EV_LIGHTNING);
randomTrap->actor.update = RandomTrap_Update; randomTrap->actor.update = RandomTrap_Update;