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

Merge branch 'HarbourMasters:develop' into develop

Browse source
This commit is contained in:
MelonSpeedruns 2022-06-02 14:13:25 -04:00 • committed by GitHub
commit 3cbb979812
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libultraship/libultraship/SohImGuiImpl.cpp
View file

@ -259,7 +259,8 @@ namespace SohImGui {
} }
void LoadRainbowColor() { void LoadRainbowColor() {
for (uint16_t s=0; s <= sizeof(RainbowColorCvarList); s++) { u8 arrayLength = sizeof(RainbowColorCvarList) / sizeof(*RainbowColorCvarList);
for (u8 s = 0; s < arrayLength; s++) {
std::string cvarName = RainbowColorCvarList[s]; std::string cvarName = RainbowColorCvarList[s];
std::string Cvar_Red = cvarName; std::string Cvar_Red = cvarName;
Cvar_Red += "R"; Cvar_Red += "R";

8
soh/soh/Enhancements/debugger/debugSaveEditor.cpp
View file

@ -1316,6 +1316,9 @@ void DrawPlayerTab() {
case ITEM_SWORD_BGS: case ITEM_SWORD_BGS:
curSword = "Biggoron's Sword"; curSword = "Biggoron's Sword";
break; break;
case ITEM_FISHING_POLE:
curSword = "Fishing Pole";
break;
case ITEM_NONE: case ITEM_NONE:
curSword = "None"; curSword = "None";
break; break;
@ -1463,6 +1466,11 @@ void DrawPlayerTab() {
Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_BGS); Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_BGS);
} }
if (ImGui::Selectable("Fishing Pole")) {
player->currentSwordItem = ITEM_FISHING_POLE;
gSaveContext.equips.buttonItems[0] = ITEM_FISHING_POLE;
Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_MASTER);
}
ImGui::EndCombo(); ImGui::EndCombo();
} }