From 6bc1131f4ae18528407438c4603cbd8c97305fc7 Mon Sep 17 00:00:00 2001 From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> Date: Wed, 25 Jun 2025 16:12:17 +0200 Subject: [PATCH] Clang --- .../randomizer/randomizer_check_tracker.cpp | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp index 281102c86..d29e56787 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp @@ -299,7 +299,8 @@ bool IsCheckHidden(RandomizerCheck rc) { bool isJunk = itemLocation->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK; 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) { @@ -1248,11 +1249,8 @@ bool ShouldShowCheck(RandomizerCheck check) { Rando::ItemLocation* itemLoc = Rando::Context::GetInstance()->GetItemLocation(check); RandomizerCheckStatus status = itemLoc->GetCheckStatus(); - if ( - hideJunk && - (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) && - itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK - ) { + if (hideJunk && (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) && + itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK) { return false; } @@ -1622,11 +1620,8 @@ bool IsVisibleInCheckTracker(RandomizerCheck rc) { Rando::ItemLocation* itemLoc = Rando::Context::GetInstance()->GetItemLocation(rc); RandomizerCheckStatus status = itemLoc->GetCheckStatus(); - if ( - hideJunk && - (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) && - itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK - ) { + if (hideJunk && (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) && + itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK) { return false; } @@ -1747,12 +1742,8 @@ void DrawLocation(RandomizerCheck rc) { return; } - if ( - !showHidden && - hideJunk && - (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) && - itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK - ) { + if (!showHidden && hideJunk && (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED) && + itemLoc->GetPlacedItem().GetGIEntry()->getItemCategory == ITEM_CATEGORY_JUNK) { return; }