From 9537df2ee7151b4072e1e8396b1ff960118a6fa5 Mon Sep 17 00:00:00 2001 From: gymnast86 Date: Wed, 15 Jul 2026 00:48:22 -0700 Subject: [PATCH] fixes for running standalone generator --- .../randomizer/generator/logic/entrance_shuffle.cpp | 2 +- src/dusk/randomizer/generator/utility/text.cpp | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/dusk/randomizer/generator/logic/entrance_shuffle.cpp b/src/dusk/randomizer/generator/logic/entrance_shuffle.cpp index 340bb7d43e..cc63431318 100644 --- a/src/dusk/randomizer/generator/logic/entrance_shuffle.cpp +++ b/src/dusk/randomizer/generator/logic/entrance_shuffle.cpp @@ -575,7 +575,7 @@ namespace randomizer::logic::entrance_shuffle { RestoreConnections(entrance, target); } - LOG_TO_DEBUG("Failed to place all entrances in a pool for World " + std::to_string(world->GetID()) + + LOG_TO_DEBUG("Failed to place all entrances in a pool for World " + std::to_string(entrancePool[0]->GetWorld()->GetID()) + ". Will retry " + std::to_string(retries) + " more times"); LOG_TO_DEBUG(e.what()); } diff --git a/src/dusk/randomizer/generator/utility/text.cpp b/src/dusk/randomizer/generator/utility/text.cpp index df57b200b2..95279ab212 100644 --- a/src/dusk/randomizer/generator/utility/text.cpp +++ b/src/dusk/randomizer/generator/utility/text.cpp @@ -352,9 +352,12 @@ namespace randomizer { }; void breakLines(std::string& str, int maxLineWidth) { + + // Randomizer Only shouldn't rely on needing access to the iso +#ifndef RANDOMIZER_ONLY // Get game's font auto gameFont = mDoExt_getMesgFont(); - +#endif int curLineWidth = 0; size_t i = 0; size_t previousSpace = 0; @@ -392,7 +395,12 @@ namespace randomizer { } JUTFont::TWidth width{}; +#ifndef RANDOMIZER_ONLY gameFont->getWidthEntry(str[i], &width); +#else + // Assume worst case with no iso access + width.field_0x1 = 21; +#endif curLineWidth += /*width.field_0x0 + */width.field_0x1; // If we exceed the maximum line width, replace the // previous space with a newline and start counting @@ -406,8 +414,10 @@ namespace randomizer { ++i; } +#ifndef RANDOMIZER_ONLY // Free game's font mDoExt_removeMesgFont(); +#endif } void applyMessageCodes(std::string& str) {