github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 13:23:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into merge-macready-805

Browse source
This commit is contained in:
Adam Bird 2024-02-28 23:49:06 -05:00
commit 7bd2a7c3a6
474 changed files with 19391 additions and 10366 deletions
Download patch file Download diff file Expand all files Collapse all files

3
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View file

@ -762,7 +762,6 @@ void InitTrackerData(bool isDebug) {
}
}
UpdateAllOrdering();
UpdateInventoryChecks();
}
void SaveTrackerData(SaveContext* saveContext, int sectionID, bool gameSave) {
@ -1162,7 +1161,7 @@ void LoadSettings() {
}
bool IsVisibleInCheckTracker(RandomizerCheckObject rcObj) {
if (IS_RANDO) {
if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LOGIC_RULES) != RO_LOGIC_VANILLA) {
return
(rcObj.rcArea != RCAREA_INVALID) && // don't show Invalid locations
(rcObj.rcType != RCTYPE_GOSSIP_STONE) && //TODO: Don't show hints until tracker supports them