mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-22 13:41:54 -05:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows

Browse Source
This commit is contained in:
Sarge-117 2022-09-04 15:36:12 -07:00
commit 5aaaccb72d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View File

@ -511,9 +511,6 @@ void DrawNotes(bool resizeable = false) {
(void*)itemTrackerNotes); (void*)itemTrackerNotes);
} }
}; };
if (itemTrackerNotes.empty()) {
itemTrackerNotes.push_back(0);
}
ImVec2 size = resizeable ? ImVec2(-FLT_MIN, ImGui::GetContentRegionAvail().y) : ImVec2(((iconSize + iconSpacing) * 6) - 8, 200); ImVec2 size = resizeable ? ImVec2(-FLT_MIN, ImGui::GetContentRegionAvail().y) : ImVec2(((iconSize + iconSpacing) * 6) - 8, 200);
ItemTrackerNotes::TrackerNotesInputTextMultiline("##ItemTrackerNotes", &itemTrackerNotes, size, ImGuiInputTextFlags_AllowTabInput); ItemTrackerNotes::TrackerNotesInputTextMultiline("##ItemTrackerNotes", &itemTrackerNotes, size, ImGuiInputTextFlags_AllowTabInput);
if (ImGui::IsItemDeactivatedAfterEdit() && IsValidSaveFile()) { if (ImGui::IsItemDeactivatedAfterEdit() && IsValidSaveFile()) {
@ -926,6 +923,10 @@ void InitItemTracker() {
trackerBgB, trackerBgB,
trackerBgA trackerBgA
}; // Float value, 1 = 255 in rgb value. }; // Float value, 1 = 255 in rgb value.
// Crashes when the itemTrackerNotes is empty, so add an empty character to it
if (itemTrackerNotes.empty()) {
itemTrackerNotes.push_back(0);
}
Ship::RegisterHook<Ship::ControllerRead>([](OSContPad* cont_pad) { Ship::RegisterHook<Ship::ControllerRead>([](OSContPad* cont_pad) {
buttonsPressed = cont_pad; buttonsPressed = cont_pad;
}); });