Skip to content

Commit 4721b8d

Browse files
committed
Merge branch 'randomizer' of https://github.com/TwilitRealm/dusk into randomizer
2 parents b06af0e + 9307d8a commit 4721b8d

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/dusk/imgui/ImGuiMenuRandomizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ namespace dusk {
510510
LocationTrackerInfo info {
511511
.locationName = location->GetName(),
512512
.logicStr = location->GetComputedRequirement().to_string(),
513-
.locationItem = itemId >= 0 ? world->GetItem(itemId)->GetName() : "Unknown",
513+
.locationItem = itemId >= 0 ? world->GetItem(itemId, true)->GetName() : "Unknown",
514514
.accessible = m_currentSearch._visitedLocations.contains(location)
515515
};
516516

src/dusk/randomizer/game/tools.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,11 @@ int getTempleKeysFound(int stage) {
168168
};
169169

170170
int count = dComIfGs_getKeyNum(stage);
171+
int saveId = getStageSaveId(stage);
171172

172173
// Add number of unlocked key doors for this dungeon to current key count
173174
for (auto flag : keyDoorFlags[stage]) {
174-
if (dComIfGs_isSwitch(stage, flag)) {
175+
if (tracker_isStageSwitch(saveId, flag)) {
175176
count += 1;
176177
}
177178
}

0 commit comments

Comments
 (0)