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

Clang

Browse source
This commit is contained in:
Pepe20129 2025-06-25 16:12:17 +02:00
commit 6bc1131f4a
1 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -299,7 +299,8 @@ bool IsCheckHidden(RandomizerCheck rc) {
bool isJunk = itemLocation->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK; bool isJunk = itemLocation->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK;
bool knownJunk = (seen || scummed) && isJunk; bool knownJunk = (seen || scummed) && isJunk;
return (skipped && hideSkipped) || (seen && hideSeen) || (scummed && hideScummed) || (unchecked && hideUnchecked) || (knownJunk && hideJunk); return (skipped && hideSkipped) || (seen && hideSeen) || (scummed && hideScummed) || (unchecked && hideUnchecked) ||
(knownJunk && hideJunk);
} }
void RecalculateAreaTotals(RandomizerCheckArea rcArea) { void RecalculateAreaTotals(RandomizerCheckArea rcArea) {
@ -1248,11 +1249,8 @@ bool ShouldShowCheck(RandomizerCheck check) {
Rando::ItemLocation* itemLoc = Rando::Context::GetInstance()->GetItemLocation(check); Rando::ItemLocation* itemLoc = Rando::Context::GetInstance()->GetItemLocation(check);
RandomizerCheckStatus status = itemLoc->GetCheckStatus(); RandomizerCheckStatus status = itemLoc->GetCheckStatus();
if ( if (hideJunk && (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) &&
hideJunk && itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK) {
(status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) &&
itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK
) {
return false; return false;
} }
@ -1622,11 +1620,8 @@ bool IsVisibleInCheckTracker(RandomizerCheck rc) {
Rando::ItemLocation* itemLoc = Rando::Context::GetInstance()->GetItemLocation(rc); Rando::ItemLocation* itemLoc = Rando::Context::GetInstance()->GetItemLocation(rc);
RandomizerCheckStatus status = itemLoc->GetCheckStatus(); RandomizerCheckStatus status = itemLoc->GetCheckStatus();
if ( if (hideJunk && (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) &&
hideJunk && itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK) {
(status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) &&
itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK
) {
return false; return false;
} }
@ -1747,12 +1742,8 @@ void DrawLocation(RandomizerCheck rc) {
return; return;
} }
if ( if (!showHidden && hideJunk && (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) &&
!showHidden && itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK) {
hideJunk &&
(status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) &&
itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK
) {
return; return;
} }