From ace11f392b18cd81540cc7c33aa31a9d00f552ad Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 8 Jan 2025 23:11:34 -0600 Subject: [PATCH] [jasper/world/studio] Cleanup --- .../world/src/studio/worldeditor/commands/modifytiles.cpp | 2 -- .../world/src/studio/worldeditor/commands/modifytiles.hpp | 2 -- .../modules/world/src/studio/worldeditor/worldeditor-imgui.cpp | 3 --- 3 files changed, 7 deletions(-) diff --git a/src/jasper/modules/world/src/studio/worldeditor/commands/modifytiles.cpp b/src/jasper/modules/world/src/studio/worldeditor/commands/modifytiles.cpp index 5b2c1ec..cd04a4c 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/commands/modifytiles.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/commands/modifytiles.cpp @@ -12,11 +12,9 @@ namespace jasper::world { ModifyTilesCommand::ModifyTilesCommand( WorldDoc &doc, WorldStatic &worldStatic, - ObjectCache &objCache, ox::Vector mods): m_doc(doc), m_worldStatic(worldStatic), - m_objCache(objCache), m_mods(std::move(mods)) { auto const unchanged = [this](Mod const&mod) { auto const&docTile = tile(m_doc, mod.layer, mod.tileAddr.x, mod.tileAddr.y); diff --git a/src/jasper/modules/world/src/studio/worldeditor/commands/modifytiles.hpp b/src/jasper/modules/world/src/studio/worldeditor/commands/modifytiles.hpp index edf41bf..90915b4 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/commands/modifytiles.hpp +++ b/src/jasper/modules/world/src/studio/worldeditor/commands/modifytiles.hpp @@ -21,13 +21,11 @@ class ModifyTilesCommand: public studio::UndoCommand { private: WorldDoc &m_doc; WorldStatic &m_worldStatic; - ObjectCache &m_objCache; ox::Vector m_mods; public: ModifyTilesCommand( WorldDoc &doc, WorldStatic &worldStatic, - ObjectCache &objCache, ox::Vector mods); ox::Error redo() noexcept override; ox::Error undo() noexcept override; 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 f8b78e4..e041b00 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp @@ -150,7 +150,6 @@ void WorldEditorImGui::cut() noexcept { std::ignore = pushCommand( m_doc, m_worldStatic, - m_objCache, std::move(mods)); } } @@ -175,7 +174,6 @@ void WorldEditorImGui::paste() { std::ignore = pushCommand( m_doc, m_worldStatic, - m_objCache, std::move(mods)); } } @@ -386,7 +384,6 @@ ox::Error WorldEditorImGui::handleDrop(float fbPaneScale) noexcept { std::ignore = pushCommand( m_doc, m_worldStatic, - m_objCache, std::move(mods)); } OX_RETURN_ERROR(loadWorldStatic(keelCtx(m_sctx), m_objCache, m_doc).moveTo(m_worldStatic));