mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Forgot Magic like a peasant!

This commit is contained in:
Caladius 2024-03-04 19:47:16 -05:00
parent 1dbacef261
commit 34e91a4500
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
soh/soh/Enhancements/timesplits/TimeSplits.cpp
View File

@ -236,7 +236,7 @@ std::vector<TimeSplitObject> inventoryObjects = {
{ ITEM_BOMB, "Bombs", "ITEM_BOMB"},
{ ITEM_BOMBCHU, "Bombchu", "ITEM_BOMBCHU"},
{ ITEM_BEAN, "Magic Bean", "ITEM_BEAN"},
{ ITEM_FISHING_POLE, "Fishing Pole", "ITEM_FISHING_POLE"},
{ ITEM_MAGIC_SMALL, "Magic Meter", "ITEM_MAGIC_SMALL"},
{ ITEM_BOW, "Fairy Bow", "ITEM_BOW"},
{ ITEM_HOOKSHOT, "Hookshot", "ITEM_HOOKSHOT"},
{ ITEM_HAMMER, "Megaton Hammer", "ITEM_HAMMER"},
@ -834,6 +834,8 @@ void DrawTimeSplitListManager() {
ImGui::OpenPopup("Hookshot");
} else if (obj.itemID == ITEM_BOTTLE) {
ImGui::OpenPopup("Bottles");
} else if (obj.itemID == ITEM_MAGIC_SMALL) {
ImGui::OpenPopup("Magic");
} else if (obj.itemID == ITEM_WALLET_ADULT) {
ImGui::OpenPopup("Wallet");
} else if (obj.itemID == ITEM_POCKET_EGG) {
@ -1078,6 +1080,22 @@ void DrawTimeSplitListManager() {
}
ImGui::EndPopup();
}
if (ImGui::BeginPopupContextItem("Magic")) {
if (ImGui::ImageButton(std::to_string(ITEM_MAGIC_SMALL).c_str(),
LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("ITEM_MAGIC_SMALL"),
ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), ImVec4(1, 1, 1, 1))) {
TimeSplitAddToSplits(ITEM_MAGIC_SMALL);
ImGui::CloseCurrentPopup();
}
ImGui::SameLine();
if (ImGui::ImageButton(std::to_string(ITEM_MAGIC_LARGE).c_str(),
LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("ITEM_MAGIC_LARGE"),
ImVec2(32.0f, 32.0f), ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0), ImVec4(1, 1, 1, 1))) {
TimeSplitAddToSplits(ITEM_MAGIC_LARGE);
ImGui::CloseCurrentPopup();
}
ImGui::EndPopup();
}
if (ImGui::BeginPopupContextItem("Wallet")) {
if (ImGui::ImageButton(std::to_string(ITEM_WALLET_ADULT).c_str(),
LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("ITEM_WALLET_ADULT"),