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 ad7aa3e..0c294cf 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp @@ -73,7 +73,7 @@ constexpr ox::Point fbPtToTileAddr( } WorldEditorImGui::WorldEditorImGui(studio::StudioContext &sctx, ox::StringParam path): - Editor(std::move(path)), + Editor(sctx, std::move(path)), m_sctx{sctx}, m_objSetPicker{"Object Set Chooser", keelCtx(m_sctx), FileExt_jwob}, m_doc{*keel::readObj(keelCtx(m_sctx), itemPath()).unwrapThrow()} { 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 87ecac4..30252c9 100644 --- a/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp @@ -22,10 +22,10 @@ namespace ig = studio::ig; constexpr auto btnSize = ImVec2{22, ig::BtnSz.y}; WorldObjectSetEditorImGui::WorldObjectSetEditorImGui( - studio::StudioContext &ctx, + studio::StudioContext &sctx, ox::StringParam path): - Editor(std::move(path)), - m_sctx{ctx}, + Editor(sctx, std::move(path)), + m_sctx{sctx}, m_itemPath{itemPath()}, m_doc{*readObj(keelCtx(m_sctx), itemPath()).unwrapThrow()}, m_tileSheet{readObj(keelCtx(m_sctx), m_doc.tilesheet) diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.hpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.hpp index 40fa837..53c1573 100644 --- a/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.hpp +++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.hpp @@ -35,7 +35,7 @@ class WorldObjectSetEditorImGui: public studio::Editor { } m_objEditor; public: - WorldObjectSetEditorImGui(studio::StudioContext &ctx, ox::StringParam path); + WorldObjectSetEditorImGui(studio::StudioContext &sctx, ox::StringParam path); void draw(studio::StudioContext&) noexcept final;