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

Setup call to RecalculateAvailableChecks instead of direct call.

Browse source
This commit is contained in:
Anthony Stewart 2025-06-19 19:45:30 -05:00
commit 77e9ef0436
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -245,7 +245,8 @@ Color_RGBA8 Color_Saved_Extra = { 0, 185, 0, 255 }; // Green
std::vector<uint32_t> buttons = { BTN_A, BTN_B, BTN_CUP, BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT, BTN_L, std::vector<uint32_t> buttons = { BTN_A, BTN_B, BTN_CUP, BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT, BTN_L,
BTN_Z, BTN_R, BTN_START, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT }; BTN_Z, BTN_R, BTN_START, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT };
static ImGuiTextFilter checkSearch; static ImGuiTextFilter checkSearch;
static bool recalculateAvailable = false; static bool gameSavedRecalculateAvailable = false;
static bool gameLoadedRecalculateAvailable = false;
std::array<bool, RCAREA_INVALID> filterAreasHidden = { 0 }; std::array<bool, RCAREA_INVALID> filterAreasHidden = { 0 };
std::array<bool, RC_MAX> filterChecksHidden = { 0 }; std::array<bool, RC_MAX> filterChecksHidden = { 0 };
@ -587,7 +588,7 @@ void CheckTrackerLoadGame(int32_t fileNum) {
Rando::Context::GetInstance()->GetEntranceShuffler()->ApplyEntranceOverrides(); Rando::Context::GetInstance()->GetEntranceShuffler()->ApplyEntranceOverrides();
} }
RecalculateAvailableChecks(); gameLoadedRecalculateAvailable = true;
} }
void CheckTrackerShopSlotChange(uint8_t cursorSlot, int16_t basePrice) { void CheckTrackerShopSlotChange(uint8_t cursorSlot, int16_t basePrice) {
@ -885,7 +886,7 @@ void SaveTrackerData(SaveContext* saveContext, int sectionID, bool fullSave) {
void SaveFile(SaveContext* saveContext, int sectionID, bool fullSave) { void SaveFile(SaveContext* saveContext, int sectionID, bool fullSave) {
SaveTrackerData(saveContext, sectionID, fullSave); SaveTrackerData(saveContext, sectionID, fullSave);
if (fullSave) { if (fullSave) {
recalculateAvailable = true; gameSavedRecalculateAvailable = true;
} }
} }
@ -994,6 +995,11 @@ void CheckTrackerWindow::DrawElement() {
return; return;
} }
if (gameLoadedRecalculateAvailable) {
gameLoadedRecalculateAvailable = false;
RecalculateAvailableChecks();
}
SceneID sceneId = SCENE_ID_MAX; SceneID sceneId = SCENE_ID_MAX;
if (gPlayState != nullptr) { if (gPlayState != nullptr) {
sceneId = (SceneID)gPlayState->sceneNum; sceneId = (SceneID)gPlayState->sceneNum;
@ -1986,7 +1992,7 @@ void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName,
} }
void RecalculateAvailableChecks(RandomizerRegion startingRegion /* = RR_ROOT */) { void RecalculateAvailableChecks(RandomizerRegion startingRegion /* = RR_ROOT */) {
if (!enableAvailableChecks || !GameInteractor::IsSaveLoaded(true)) { if (!enableAvailableChecks || !GameInteractor::IsSaveLoaded()) {
return; return;
} }
@ -2052,8 +2058,8 @@ static std::unordered_map<int32_t, const char*> buttonStrings = {
}; };
void CheckTrackerSettingsWindow::DrawElement() { void CheckTrackerSettingsWindow::DrawElement() {
if (recalculateAvailable) { if (gameSavedRecalculateAvailable) {
recalculateAvailable = false; gameSavedRecalculateAvailable = false;
RecalculateAvailableChecks(); RecalculateAvailableChecks();
} }
ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, { 8.0f, 8.0f }); ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, { 8.0f, 8.0f });