mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-21 14:55:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added small key null checks. (#7019)

Browse Source
This commit is contained in:
xxAtrain223
2026-08-04 22:21:08 -05:00
committed by GitHub
parent a75c8113dd
commit 7be4a5941a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/dungeon.cpp
+4
View File
@@ -99,6 +99,10 @@ RandomizerSettingKey DungeonInfo::GetMQSetting() const {
}
int8_t FindUsedSmallKeys(const SaveContext* saveContext, const SceneID scene, const std::vector<uint8_t>* DoorFlags) {
if (DoorFlags == nullptr) {
return 0;
}
// Get the swch value for the scene
uint32_t swch;
if (gPlayState != nullptr && gPlayState->sceneNum == scene) {
soh/soh/Enhancements/randomizer/logic.cpp
+5 -1
View File
@@ -2699,7 +2699,11 @@ int8_t Logic::GetSmallKeyCount(SceneID sceneId) {
return FindTotalSmallKeys(mSaveContext, SCENE_THIEVES_HIDEOUT, &DoorFlags);
}
return Rando::Context::GetInstance()->GetDungeons()->GetDungeonFromScene(sceneId)->GetTotalSmallKeys(mSaveContext);
if (auto* dungeon = Rando::Context::GetInstance()->GetDungeons()->GetDungeonFromScene(sceneId)) {
return dungeon->GetTotalSmallKeys(mSaveContext);
}
return FindTotalSmallKeys(mSaveContext, sceneId, nullptr);
}
void Logic::SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count) {