diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp index 3b13254..993370f 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp @@ -159,10 +159,10 @@ void WorldEditorImGui::drawPropEditor() noexcept { int width{m_doc.columns}; int height{m_doc.rows}; if (ImGui::InputInt("Map Width", &width, 1)) { - pushCommand(m_objCache, m_doc, m_worldStatic, ox::Size{width, m_doc.rows}); + std::ignore = pushCommand(m_objCache, m_doc, m_worldStatic, ox::Size{width, m_doc.rows}); } if (ImGui::InputInt("Map Height", &height, 1)) { - pushCommand(m_objCache, m_doc, m_worldStatic, ox::Size{m_doc.columns, height}); + std::ignore = pushCommand(m_objCache, m_doc, m_worldStatic, ox::Size{m_doc.columns, height}); } } @@ -211,7 +211,7 @@ void WorldEditorImGui::drawWorldView() noexcept { static_cast(viewSz.width) * fbPaneScale, static_cast(viewSz.height) * fbPaneScale}); if (tileAddr.x < m_doc.columns && tileAddr.y < m_doc.rows) { - pushCommand( + std::ignore = pushCommand( m_doc, m_worldStatic, m_objCache, @@ -231,12 +231,12 @@ void WorldEditorImGui::drawWorldView() noexcept { ox::Error WorldEditorImGui::addObjSet(ox::StringView path) noexcept { oxRequire(uuid, keel::pathToUuid(keelCtx(m_sctx.tctx), path)); - pushCommand(m_doc, uuid); + std::ignore = pushCommand(m_doc, uuid); return {}; } void WorldEditorImGui::rmObjSet() noexcept { - pushCommand(m_doc, m_palMgr.selectedIdx); + std::ignore = pushCommand(m_doc, m_palMgr.selectedIdx); } ox::Error WorldEditorImGui::handleObjectSetUpdate(ox::StringView, ox::UUID const&uuid) noexcept { diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp index 338d2cd..149d50d 100644 --- a/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp @@ -91,7 +91,7 @@ void WorldObjectSetEditorImGui::drawTileSheetSelector() noexcept { auto const&tilesheetList = m_sctx.project->fileList(ncore::FileExt_ng); auto sel = m_selectedTilesheetIdx; if (ig::ComboBox("Tile Sheet", tilesheetList, sel)) { - undoStack()->push(ox::make_unique + std::ignore = undoStack()->push(ox::make_unique (m_doc, ox::FileAddress(tilesheetList[sel]), sel, m_selectedTilesheetIdx)); loadObj(); } @@ -102,12 +102,12 @@ void WorldObjectSetEditorImGui::drawObjSelector() noexcept { if (ig::PushButton("+", btnSize)) { auto cmd = ox::make_unique(m_doc); m_selectedObj = cmd->insertIdx(); - undoStack()->push(std::move(cmd)); + std::ignore = undoStack()->push(std::move(cmd)); loadObj(); } ImGui::SameLine(); if (ig::PushButton("-", btnSize)) { - undoStack()->push(ox::make_unique(m_doc, m_selectedObj)); + std::ignore = undoStack()->push(ox::make_unique(m_doc, m_selectedObj)); } if (ig::ListBox("Objects", [this](size_t i) -> ox::CStringView { return m_doc.objects[i].name; @@ -156,7 +156,7 @@ void WorldObjectSetEditorImGui::drawObjEditor() noexcept { ImGui::NewLine(); auto &nameBuff = m_objEditor.nameBuff; if (ImGui::InputText("Name", nameBuff.data(), nameBuff.size())) { - undoStack()->push(ox::make_unique( + std::ignore = undoStack()->push(ox::make_unique( m_doc, m_selectedObj, ox::String(nameBuff.data(), ox::strnlen(nameBuff.data(), nameBuff.size())))); @@ -165,7 +165,7 @@ void WorldObjectSetEditorImGui::drawObjEditor() noexcept { { ig::IDStackItem const subsheetSelectorStackItem("SubsheetSelector"); if (ig::ComboBox("Palette", m_paletteDisplayNames, m_objEditor.palette)) { - undoStack()->push(ox::make_unique( + std::ignore = undoStack()->push(ox::make_unique( m_doc, m_selectedObj, static_cast(m_objEditor.palette))); } ImGui::Separator(); @@ -205,7 +205,7 @@ void WorldObjectSetEditorImGui::drawObjEditor() noexcept { auto &obj = activeObj(); auto intermediate = obj.collisionMap; if (m_colView.click(mousePos, intermediate)) { - undoStack()->push(ox::make_unique(m_doc, m_selectedObj, intermediate)); + std::ignore = undoStack()->push(ox::make_unique(m_doc, m_selectedObj, intermediate)); } } } @@ -225,7 +225,7 @@ void WorldObjectSetEditorImGui::drawSubSheetNode(ncore::TileSheet::SubSheet cons } } else if (ImGui::TreeNodeEx(ss.name.c_str(), ImGuiTreeNodeFlags_Leaf | selected)) { if (ImGui::IsItemClicked()) { - undoStack()->push(ox::make_unique(m_doc, m_selectedObj, ss.id)); + std::ignore = undoStack()->push(ox::make_unique(m_doc, m_selectedObj, ss.id)); } ImGui::TreePop(); } @@ -284,7 +284,7 @@ void WorldObjectSetEditorImGui::drawAddPalettePopup() noexcept { auto const&palettes = m_sctx.project->fileList(ncore::FileExt_npal); ig::ComboBox("Palette", palettes, m_addPalPopup.selectedIdx); if (ig::PopupControlsOkCancel(popupSz.x, m_addPalPopup.show) == ig::PopupResponse::OK) { - undoStack()->push(ox::make_unique( + std::ignore = undoStack()->push(ox::make_unique( m_doc, ox::FileAddress(palettes[m_addPalPopup.selectedIdx]))); } @@ -305,7 +305,7 @@ void WorldObjectSetEditorImGui::drawEditPalettePopup() noexcept { m_editPalPopup.intervalInputVal = static_cast(ox::clamp(m_editPalPopup.intervalInputVal, 0, 60000)); if (ig::PopupControlsOkCancel(popupSz.x, m_editPalPopup.show) == ig::PopupResponse::OK) { - undoStack()->push(ox::make_unique( + std::ignore = undoStack()->push(ox::make_unique( pal, static_cast(m_editPalPopup.intervalInputVal))); } ImGui::EndPopup(); @@ -318,7 +318,7 @@ void WorldObjectSetEditorImGui::addPalette() noexcept { } void WorldObjectSetEditorImGui::rmPalette() noexcept { - undoStack()->push(ox::make_unique( + std::ignore = undoStack()->push(ox::make_unique( m_doc, m_selectedPal)); }