Skip to content

Commit 0ccec8c

Browse files
actually run clang-format
1 parent f3ebe52 commit 0ccec8c

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

soh/soh/Enhancements/enemyrandomizer.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -534,14 +534,15 @@ bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy) {
534534
// Flare dancer, Arwing & Dark Link - Both go out of bounds way too easily, softlocking the player.
535535
// Wallmaster - Not easily visible, often makes players think they're softlocked and that there's no enemies left.
536536
// Club Moblin - Many issues with them falling or placing out of bounds. Maybe fixable in the future?
537-
bool enemiesToExcludeClearRooms =
538-
enemy.id == ACTOR_EN_FZ || enemy.id == ACTOR_EN_VM || enemy.id == ACTOR_EN_SB || enemy.id == ACTOR_EN_NY ||
539-
enemy.id == ACTOR_EN_CLEAR_TAG || enemy.id == ACTOR_EN_WALLMAS || enemy.id == ACTOR_EN_TORCH2 ||
540-
(enemy.id == ACTOR_EN_MB && enemy.params == 0) || enemy.id == ACTOR_EN_FD || enemy.id == ACTOR_EN_ANUBICE_TAG
541-
|| enemy.id == ACTOR_EN_DOG;
537+
bool enemiesToExcludeClearRooms = enemy.id == ACTOR_EN_FZ || enemy.id == ACTOR_EN_VM || enemy.id == ACTOR_EN_SB ||
538+
enemy.id == ACTOR_EN_NY || enemy.id == ACTOR_EN_CLEAR_TAG ||
539+
enemy.id == ACTOR_EN_WALLMAS || enemy.id == ACTOR_EN_TORCH2 ||
540+
(enemy.id == ACTOR_EN_MB && enemy.params == 0) || enemy.id == ACTOR_EN_FD ||
541+
enemy.id == ACTOR_EN_ANUBICE_TAG || enemy.id == ACTOR_EN_DOG;
542542

543543
// Bari - Spawns 3 more enemies, potentially extremely difficult in timed rooms.
544-
bool enemiesToExcludeTimedRooms = enemiesToExcludeClearRooms || enemy.id == ACTOR_EN_VALI || enemy.id == ACTOR_EN_DOG;
544+
bool enemiesToExcludeTimedRooms =
545+
enemiesToExcludeClearRooms || enemy.id == ACTOR_EN_VALI || enemy.id == ACTOR_EN_DOG;
545546

546547
switch (sceneNum) {
547548
// Deku Tree

soh/soh/SohGui/SohMenuEnhancements.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,9 +1692,7 @@ void SohMenu::AddMenuEnhancements() {
16921692
.PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0); });
16931693
AddWidget(path, "Include Dogs in Randomizer", WIDGET_CVAR_CHECKBOX)
16941694
.CVar(CVAR_ENHANCEMENT("RandomizeDogs"))
1695-
.PreFunc([](WidgetInfo& info) {
1696-
info.isHidden = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0);
1697-
})
1695+
.PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0); })
16981696
.Options(CheckboxOptions().Tooltip("Dogs will be randomized and can replace enemies."))
16991697
.Callback([](WidgetInfo& info) { GetSelectedEnemies(); });
17001698
AddWidget(path, "Enemy List", WIDGET_SEPARATOR).PreFunc([](WidgetInfo& info) {

0 commit comments

Comments
 (0)