Skip to content

fix: Fix Spoiler log generation. #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhlexPlexico merged 2 commits into from
Sep 28, 2026
Merged

fix: Fix Spoiler log generation. #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ca248a
nit: Update Z3DR.
PhlexPlexico Sep 28, 2026
0cc145d
nit: Remove the for loop and use const instead of i.
PhlexPlexico Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Z3DR
Open in desktop
Submodule Z3DR updated 12 files
+1 −1 .github/workflows/clang-format.yml
+1 −1 .github/workflows/clang-pr-format-check.yml
+1 −0 code/include/rnd/item_override.h
+2 −2 code/include/rnd/savefile.h
+4 −0 code/mm.ld
+5 −6 code/source/asm/songsanity_hooks.s
+6 −1 code/source/asm/songsanity_patches.s
+0 −1 code/source/lib/abi.c
+6 −6 code/source/rnd/actors/en_giant.cpp
+13 −12 code/source/rnd/item_override.cpp
+2 −2 code/source/rnd/item_table.cpp
+6 −0 code/source/rnd/item_upgrade.cpp
30 changes: 19 additions & 11 deletions source/spoiler_log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,33 +360,41 @@ static void WriteIngameSpoilerLog() {
spoilerData.ItemLocationsCount = spoilerTotalItems;

if (Settings::IngameSpoilers) {
bool playthroughItemNotFound = false;
// Write playthrough data to in-game spoiler log
if (!spoilerOutOfSpace) {
for (u32 i = 0; i < playthroughLocations.size(); i++) {
if (i >= SPOILER_SPHERES_MAX) {
// Locations hidden from the item list above (vanilla tokens and stray fairies, alternate
// checks, ...) can still be in the playthrough. Leave them out here too; a sphere made only
// of hidden locations is dropped rather than shown empty.
u32 sphere = 0;
for (const std::vector<LocationKey>& sphereLocations : playthroughLocations) {
if (sphere >= SPOILER_SPHERES_MAX) {
spoilerOutOfSpace = true;
break;
}
spoilerData.Spheres[i].ItemLocationsOffset = spoilerSphereItemoffset;
for (u32 loc = 0; loc < playthroughLocations[i].size(); ++loc) {
spoilerData.Spheres[sphere].ItemLocationsOffset = spoilerSphereItemoffset;
spoilerData.Spheres[sphere].ItemCount = 0;
for (const LocationKey key : sphereLocations) {
if (spoilerSphereItemoffset >= SPOILER_ITEMS_MAX) {
spoilerOutOfSpace = true;
break;
}

const auto foundItemLoc = itemLocationsMap.find(playthroughLocations[i][loc]);
const auto foundItemLoc = itemLocationsMap.find(key);
if (foundItemLoc != itemLocationsMap.end()) {
spoilerData.SphereItemLocations[spoilerSphereItemoffset++] = foundItemLoc->second;
} else {
playthroughItemNotFound = true;
++spoilerData.Spheres[sphere].ItemCount;
}
++spoilerData.Spheres[i].ItemCount;
}
++spoilerData.SphereCount;
if (spoilerData.Spheres[sphere].ItemCount > 0) {
++sphere;
}
if (spoilerOutOfSpace) {
break;
}
}
spoilerData.SphereCount = sphere;
}
if (spoilerOutOfSpace || playthroughItemNotFound) {
if (spoilerOutOfSpace) {
printf("%sError!%s ", YELLOW, WHITE);
}
}
Expand Down
Loading