mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-16 23:30:15 -05:00
Code Issues Projects Releases Wiki Activity

Enemy Rando Hyrule Field crash hotfix (#2222)

Browse Source
This commit is contained in:
aMannus 2022-12-21 07:03:05 +01:00 committed by GitHub
parent 8c8111c7b8
commit e03ef85f3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
View File

@ -239,10 +239,14 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, PlayState* play) {
spawnPos = this->actor.world.pos; spawnPos = this->actor.world.pos;
// In authentic gameplay, the game checks how many Stalchildren were spawned and only spawns new ones // In authentic gameplay, the game checks how many Stalchildren were spawned and only spawns new ones
// when the old ones are despawned and a timer is reached. // when the old ones are despawned and a timer is reached.
// With Enemy Randomizer on, this will keep spawning enemies solely on the timer because it's much // With Enemy Randomizer on, this will keep spawning enemies based on the timer and the total amount of existing
// more difficult tracking how many enemies have been spawned/killed. It's also fun. :) // enemies because it's much more difficult tracking how many enemies specifically spawned by this spawner have
if ((this->curNumSpawn < this->maxCurSpawns && this->totalNumSpawn < this->maxTotalSpawns) || CVar_GetS32("gRandomizedEnemies", 0)) { // been spawned and/or killed.
while ((this->curNumSpawn < this->maxCurSpawns && this->totalNumSpawn < this->maxTotalSpawns) || CVar_GetS32("gRandomizedEnemies", 0)) { int8_t enemyCount = play->actorCtx.actorLists[ACTORCAT_ENEMY].length;
if ((this->curNumSpawn < this->maxCurSpawns && this->totalNumSpawn < this->maxTotalSpawns) ||
(CVar_GetS32("gRandomizedEnemies", 0) && enemyCount < 15)) {
while ((this->curNumSpawn < this->maxCurSpawns && this->totalNumSpawn < this->maxTotalSpawns) ||
(CVar_GetS32("gRandomizedEnemies", 0) && enemyCount < 15)) {
if (play->sceneNum == SCENE_SPOT00) { if (play->sceneNum == SCENE_SPOT00) {
if ((player->unk_89E == 0) || (player->actor.floorBgId != BGCHECK_SCENE) || if ((player->unk_89E == 0) || (player->actor.floorBgId != BGCHECK_SCENE) ||
!(player->actor.bgCheckFlags & 1) || (player->stateFlags1 & 0x08000000)) { !(player->actor.bgCheckFlags & 1) || (player->stateFlags1 & 0x08000000)) {