mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-09-10 04:42:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix save editor v2 (#7170)

Browse Source 
C-button loop should not read D-pad,
D-pad keys off index like SyncButtonItemsForSlot,
B-button skips, ITEM_NONE while swordless would every empty slot green
This commit is contained in:
Philip Dubé
2026-09-08 19:54:32 +00:00
committed by GitHub
parent d37a378466
commit 36d03b9bce
1 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+8 -26
View File
@@ -997,43 +997,25 @@ void DrawInventoryTab() {
uint8_t item = gSaveContext.inventory.items[index];
// Check if this item is equipped and which slot for colored border
enum EquippedSlot { None, BButton, CButton, DPad };
enum EquippedSlot { None, CButton, DPad };
EquippedSlot equippedSlot = EquippedSlot::None;
// Check C button slots (cButtonSlots maps to inventory slot indices)
for (int cBtn = 0; cBtn < 4; cBtn++) {
if (gSaveContext.equips.cButtonSlots[cBtn] == index) {
equippedSlot = EquippedSlot::CButton;
for (size_t btn = 1; btn < ARRAY_COUNT(gSaveContext.equips.buttonItems); btn++) {
if (btn >= 4 && !dpadEnabled) {
break;
}
}
// Check D-pad slots (buttonItems[4-7] - need to match the item, not slot)
if (equippedSlot == EquippedSlot::None && dpadEnabled) {
for (int dpadBtn = 4; dpadBtn <= 7; dpadBtn++) {
if (gSaveContext.equips.buttonItems[dpadBtn] == item) {
equippedSlot = EquippedSlot::DPad;
break;
}
if (gSaveContext.equips.cButtonSlots[btn - 1] == index) {
equippedSlot = btn < 4 ? EquippedSlot::CButton : EquippedSlot::DPad;
break;
}
}
// For B button (buttonItems[0])
if (equippedSlot == EquippedSlot::None && gSaveContext.equips.buttonItems[0] == item) {
equippedSlot = EquippedSlot::BButton;
}
// Determine border color (needed before group for proper rendering)
ImU32 borderColor = 0;
bool drawBorder = equippedSlot != EquippedSlot::None;
if (drawBorder) {
if (equippedSlot == EquippedSlot::CButton) {
borderColor = IM_COL32(255, 165, 0, 255); // Orange for C-button
} else if (equippedSlot == EquippedSlot::DPad) {
borderColor = IM_COL32(180, 180, 180, 255); // Light grey for D-pad
} else {
// B button color (green for N64, red for GC)
bool isGcScheme = CVarGetInteger(CVAR_COSMETIC("DefaultColorScheme"), 0) == 1;
borderColor = isGcScheme ? IM_COL32(255, 0, 0, 255) : IM_COL32(0, 255, 0, 255);
}
borderColor = equippedSlot == EquippedSlot::CButton ? IM_COL32(255, 165, 0, 255) // Orange for C-button
: IM_COL32(180, 180, 180, 255); // Light grey D-pad
}
ImGui::BeginGroup();