izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix imgui BeginTable not wrapped in if statements (#372)

Browse Source
This commit is contained in:
Archez
2024-05-22 09:05:04 -05:00
committed by Garrett Cox
parent 1bdb4a29ac
commit a46850859a
2 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/2s2h/DeveloperTools/SaveEditor.cpp
+21 -18
View File
@@ -911,6 +911,8 @@ void DrawPlayerTab() {
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 3.0f);
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8.0f, 8.0f));
ImGui::BeginChild("playerTab", ImVec2(0, 0), true);
if (gPlayState) {
Player* player = GET_PLAYER(gPlayState);
ImGui::BeginChild("playerLocation", ImVec2(INV_GRID_WIDTH * 8 + INV_GRID_PADDING * 2, INV_GRID_HEIGHT * 1.75f + INV_GRID_PADDING * 2 + INV_GRID_TOP_MARGIN), ImGuiChildFlags_Border);
@@ -1039,28 +1041,29 @@ void DrawPlayerTab() {
ImGui::Text("Player States");
uint32_t states[4] = { player->stateFlags1, player->stateFlags2, player->stateFlags3, player->meleeWeaponState };
ImGui::BeginTable("stateTable", 4);
GetPlayerForm(GET_PLAYER_FORM);
ImGui::PushStyleVar(ImGuiTableColumnFlags_WidthFixed, 15.0f);
ImGui::PushStyleColor(ImGuiCol_TableHeaderBg, formColor);
ImGui::TableSetupColumn("State 1");
ImGui::TableSetupColumn("State 2");
ImGui::TableSetupColumn("State 3");
ImGui::TableSetupColumn("Sword State");
ImGui::TableHeadersRow();
ImGui::TableNextColumn();
for (int i = 0; i <= 3; i++) {
ImGui::Text(std::to_string(states[i]).c_str());
if (ImGui::BeginTable("stateTable", 4)) {
GetPlayerForm(GET_PLAYER_FORM);
ImGui::PushStyleVar(ImGuiTableColumnFlags_WidthFixed, 15.0f);
ImGui::PushStyleColor(ImGuiCol_TableHeaderBg, formColor);
ImGui::TableSetupColumn("State 1");
ImGui::TableSetupColumn("State 2");
ImGui::TableSetupColumn("State 3");
ImGui::TableSetupColumn("Sword State");
ImGui::TableHeadersRow();
ImGui::TableNextColumn();
for (int i = 0; i <= 3; i++) {
ImGui::Text(std::to_string(states[i]).c_str());
ImGui::TableNextColumn();
}
ImGui::PopStyleColor(1);
ImGui::PopStyleVar(1);
ImGui::EndTable();
}
ImGui::PopStyleColor(1);
ImGui::PopStyleVar(1);
ImGui::EndTable();
ImGui::EndChild();
}
ImGui::EndChild();
ImGui::PopStyleVar(2);
ImGui::PopStyleColor(1);
}