Skip to content

Commit c2c4816

Browse files
committed
Version Name Change, Triforce Tracker Defaults
1 parent 4fcf1b0 commit c2c4816

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
66
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
77

88
project(Ship VERSION 8.0.3 LANGUAGES C CXX)
9-
set(PROJECT_BUILD_NAME "MacReady Delta" CACHE STRING "")
9+
set(PROJECT_BUILD_NAME "Holiday 2023" CACHE STRING "")
1010
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
1111

1212
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ void DrawItemCount(ItemTrackerItem item) {
506506
uint8_t piecesTotal = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_TOTAL);
507507
ImU32 currentColor = gSaveContext.triforcePiecesCollected >= piecesRequired ? IM_COL_GREEN : IM_COL_WHITE;
508508
ImU32 maxColor = IM_COL_GREEN;
509-
int32_t trackerTriforcePieceNumberDisplayMode = CVarGetInteger("gItemTrackerTriforcePieceTrack", TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX);
509+
int32_t trackerTriforcePieceNumberDisplayMode = CVarGetInteger("gItemTrackerTriforcePieceTrack", TRIFORCE_PIECE_COLLECTED_REQUIRED);
510510

511511
currentString += std::to_string(gSaveContext.triforcePiecesCollected);
512512
currentString += "/";
@@ -1149,7 +1149,7 @@ void ItemTrackerSettingsWindow::DrawElement() {
11491149
UIWidgets::Spacer(0);
11501150

11511151
ImGui::Text("Christmas ornament Count Tracking");
1152-
UIWidgets::EnhancementCombobox("gItemTrackerTriforcePieceTrack", itemTrackerTriforcePieceTrackOptions, TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX);
1152+
UIWidgets::EnhancementCombobox("gItemTrackerTriforcePieceTrack", itemTrackerTriforcePieceTrackOptions, TRIFORCE_PIECE_COLLECTED_REQUIRED);
11531153
UIWidgets::InsertHelpHoverText("Customize what numbers are shown for ornament tracking.");
11541154

11551155
ImGui::TableNextColumn();

0 commit comments

Comments
 (0)