mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-25 02:42:18 -05:00
Code Issues Projects Releases Wiki Activity

Restores check color functionality. (#4451)

Browse Source
This commit is contained in:
Malkierian 2024-10-20 01:03:47 -07:00 committed by GitHub
parent 323c67b47c
commit 6d1d57d19a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View File

@ -1398,7 +1398,7 @@ void DrawLocation(RandomizerCheck rc) {
mainColor = mainColor =
!IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
? Color_Collected_Extra_Default ? Color_Collected_Extra_Default
: Color_Main_Default; : Color_Collected_Main;
extraColor = Color_Collected_Extra_Default; extraColor = Color_Collected_Extra_Default;
} else if (status == RCSHOW_SAVED) { } else if (status == RCSHOW_SAVED) {
if (!showHidden && hideSaved) { if (!showHidden && hideSaved) {
@ -1407,7 +1407,7 @@ void DrawLocation(RandomizerCheck rc) {
mainColor = mainColor =
!IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
? Color_Saved_Extra_Default ? Color_Saved_Extra_Default
: Color_Main_Default; : Color_Saved_Main;
extraColor = Color_Saved_Extra_Default; extraColor = Color_Saved_Extra_Default;
} else if (skipped) { } else if (skipped) {
if (!showHidden && hideSkipped) { if (!showHidden && hideSkipped) {
@ -1416,7 +1416,7 @@ void DrawLocation(RandomizerCheck rc) {
mainColor = mainColor =
!IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
? Color_Skipped_Extra_Default ? Color_Skipped_Extra_Default
: Color_Main_Default; : Color_Skipped_Main;
extraColor = Color_Skipped_Extra_Default; extraColor = Color_Skipped_Extra_Default;
} else if (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED) { } else if (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED) {
if (!showHidden && hideSeen) { if (!showHidden && hideSeen) {
@ -1425,7 +1425,7 @@ void DrawLocation(RandomizerCheck rc) {
mainColor = mainColor =
!IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
? Color_Seen_Extra_Default ? Color_Seen_Extra_Default
: Color_Main_Default; : Color_Seen_Main;
extraColor = Color_Seen_Extra_Default; extraColor = Color_Seen_Extra_Default;
} else if (status == RCSHOW_SCUMMED) { } else if (status == RCSHOW_SCUMMED) {
if (!showHidden && hideScummed) { if (!showHidden && hideScummed) {
@ -1434,7 +1434,7 @@ void DrawLocation(RandomizerCheck rc) {
mainColor = mainColor =
!IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
? Color_Scummed_Extra_Default ? Color_Scummed_Extra_Default
: Color_Main_Default; : Color_Scummed_Main;
extraColor = Color_Scummed_Extra_Default; extraColor = Color_Scummed_Extra_Default;
} else if (status == RCSHOW_UNCHECKED) { } else if (status == RCSHOW_UNCHECKED) {
if (!showHidden && hideUnchecked) { if (!showHidden && hideUnchecked) {
@ -1443,7 +1443,7 @@ void DrawLocation(RandomizerCheck rc) {
mainColor = mainColor =
!IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO !IsHeartPiece((GetItemID)Rando::StaticData::RetrieveItem(loc->GetVanillaItem()).GetItemID()) && !IS_RANDO
? Color_Unchecked_Extra_Default ? Color_Unchecked_Extra_Default
: Color_Main_Default; : Color_Unchecked_Main;
extraColor = Color_Unchecked_Extra_Default; extraColor = Color_Unchecked_Extra_Default;
} }