AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Split Amount/Capacity sliders in Items window

This commit is contained in:
Luke Street 2021-05-30 18:56:33 -04:00
parent beb3f65c2b
commit 24115948ce
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Runtime/ImGuiConsole.cpp
View File

@ -965,17 +965,23 @@ static void RenderItemType(CPlayerState& pState, CPlayerState::EItemType itemTyp
} }
} }
} else if (maxValue > 1) { } else if (maxValue > 1) {
std::array<int, 2> item{}; int capacity = pState.GetItemCapacity(itemType);
item[0] = int(pState.GetItemAmount(itemType)); int amount = pState.GetItemAmount(itemType);
item[1] = int(pState.GetItemCapacity(itemType)); if (ImGui::SliderInt((name + " (Capacity)").c_str(), &capacity, 0, int(maxValue), "%d",
if (ImGui::SliderInt2((name + " (Amount/Capacity)").c_str(), item.data(), 0, int(maxValue), "%d",
ImGuiSliderFlags_AlwaysClamp)) { ImGuiSliderFlags_AlwaysClamp)) {
if (itemType == CPlayerState::EItemType::Missiles) { if (itemType == CPlayerState::EItemType::Missiles) {
pState.ReInitializePowerUp(itemType, roundMultiple(item[1], 5)); pState.ReInitializePowerUp(itemType, roundMultiple(capacity, 5));
} else { } else {
pState.ReInitializePowerUp(itemType, u32(item[1])); pState.ReInitializePowerUp(itemType, u32(capacity));
} }
pState.ResetAndIncrPickUp(itemType, u32(item[0])); pState.ResetAndIncrPickUp(itemType, u32(capacity));
}
if (capacity > 0) {
if (ImGui::SliderInt((name + " (Amount)").c_str(), &amount, 0, capacity, "%d", ImGuiSliderFlags_AlwaysClamp)) {
pState.ResetAndIncrPickUp(itemType, u32(amount));
}
} else {
ImGui::Dummy(ImGui::GetItemRectSize());
} }
} }
} }