From 394f1646e65de50e84c22270d48e7d9ef47b56b3 Mon Sep 17 00:00:00 2001 From: scawful Date: Mon, 22 Jan 2024 03:31:33 -0500 Subject: [PATCH] housekeeping --- src/app/editor/modules/tile16_editor.cc | 5 ++--- src/app/emu/emulator.cc | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/editor/modules/tile16_editor.cc b/src/app/editor/modules/tile16_editor.cc index 08ff7dbb..4488830b 100644 --- a/src/app/editor/modules/tile16_editor.cc +++ b/src/app/editor/modules/tile16_editor.cc @@ -71,8 +71,7 @@ absl::Status Tile16Editor::Update() { // Create a tab for Tile16 Transfer if (BeginTabItem("Tile16 Transfer")) { - if (BeginTable("#Tile16TransferTable", 2, - ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable, + if (BeginTable("#Tile16TransferTable", 2, TABLE_BORDERS_RESIZABLE, ImVec2(0, 0))) { TableSetupColumn("Current ROM Tiles", ImGuiTableColumnFlags_WidthFixed, ImGui::GetContentRegionAvail().x / 2); @@ -145,7 +144,7 @@ absl::Status Tile16Editor::UpdateTile16Edit() { tile16_edit_canvas_.DrawBitmap(current_tile16_bmp_, 0, 0, 4.0f); tile16_edit_canvas_.HandleTileEdits( tile8_source_canvas_, current_gfx_individual_, current_tile8_bmp_, - current_tile8_, 2.0f); + current_tile8_, 4.0f); tile16_edit_canvas_.DrawGrid(128.0f); tile16_edit_canvas_.DrawOverlay(); diff --git a/src/app/emu/emulator.cc b/src/app/emu/emulator.cc index 54458877..11e8a30b 100644 --- a/src/app/emu/emulator.cc +++ b/src/app/emu/emulator.cc @@ -33,7 +33,7 @@ using ImGui::TableNextColumn; using ImGui::Text; void Emulator::Run() { - if (!snes_.running() && rom()->isLoaded()) { + if (!snes_.running() && rom()->is_loaded()) { snes_.SetupMemory(*rom()); snes_.Init(*rom()); }