diff --git a/src/jasper/modules/world/include/jasper/world/worldobject.hpp b/src/jasper/modules/world/include/jasper/world/worldobject.hpp index 8475fe2..239a729 100644 --- a/src/jasper/modules/world/include/jasper/world/worldobject.hpp +++ b/src/jasper/modules/world/include/jasper/world/worldobject.hpp @@ -30,7 +30,7 @@ struct WorldObject { ObjectId id{}; ox::String name; uint16_t intervalMs{}; - uint16_t palBank{}; + uint8_t palBank{}; ncore::SubSheetId subsheetId{}; CollisionMap collisionMap{}; uint8_t frames{}; diff --git a/src/jasper/modules/world/include/jasper/world/worldstatic.hpp b/src/jasper/modules/world/include/jasper/world/worldstatic.hpp index 3139315..80cadee 100644 --- a/src/jasper/modules/world/include/jasper/world/worldstatic.hpp +++ b/src/jasper/modules/world/include/jasper/world/worldstatic.hpp @@ -82,10 +82,10 @@ OX_MODEL_END() struct ObjTileRefSet { static constexpr auto TypeName = "net.drinkingtea.jasper.world.ObjTileRefSet"; static constexpr auto TypeVersion = 1; - uint16_t palBank{}; uint16_t tilesheetIdx{}; uint16_t cbbIdx{}; uint8_t cbb{}; + uint8_t palBank{}; // which tilesheet to use uint8_t tilesheetId{}; uint8_t tileCnt{}; @@ -95,10 +95,10 @@ struct ObjTileRefSet { }; OX_MODEL_BEGIN(ObjTileRefSet) - OX_MODEL_FIELD(palBank) OX_MODEL_FIELD(tilesheetIdx) OX_MODEL_FIELD(cbbIdx) OX_MODEL_FIELD(cbb) + OX_MODEL_FIELD(palBank) OX_MODEL_FIELD(tilesheetId) OX_MODEL_FIELD(tileCnt) OX_MODEL_FIELD(frames) diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.cpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.cpp index 657beeb..27d5de6 100644 --- a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.cpp +++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.cpp @@ -15,8 +15,8 @@ RmPalette::RmPalette(WorldObjectSet &doc, size_t const rmIdx) noexcept: m_objUpdates.reserve(m_doc.objects.size()); for (size_t i = 0; auto const&obj : m_doc.objects) { if (obj.palBank >= m_rmIdx) { - auto const newPalBank = static_cast(obj.palBank == m_rmIdx ? - 0 : obj.palBank - 1); + uint8_t const newPalBank = obj.palBank == m_rmIdx ? + 0 : obj.palBank - 1; m_objUpdates.emplace_back(ObjUpdate{ .idx = i, .oldPalBank = obj.palBank, diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.hpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.hpp index 4b9c5b9..3b5e305 100644 --- a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.hpp +++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.hpp @@ -19,8 +19,8 @@ class RmPalette: public studio::UndoCommand { size_t const m_rmIdx = 0; struct ObjUpdate { size_t idx{}; - uint16_t oldPalBank{}; - uint16_t newPalBank{}; + uint8_t oldPalBank{}; + uint8_t newPalBank{}; }; ox::Vector m_objUpdates; public: 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 691b9ef..6c53b05 100644 --- a/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp @@ -183,7 +183,7 @@ void WorldObjectSetEditorImGui::drawObjEditor() noexcept { ig::IDStackItem const subsheetSelectorStackItem("SubsheetSelector"); if (ig::ComboBox("Palette", m_paletteDisplayNames, m_objEditor.palette)) { std::ignore = pushCommand( - m_doc, m_selectedObj, static_cast(m_objEditor.palette)); + m_doc, m_selectedObj, static_cast(m_objEditor.palette)); } if (ImGui::InputInt("Frames", &m_objEditor.frames, 1)) { m_objEditor.frames = ox::max(m_objEditor.frames, 1); diff --git a/src/jasper/modules/world/src/worldstatic.cpp b/src/jasper/modules/world/src/worldstatic.cpp index a24a282..ab202de 100644 --- a/src/jasper/modules/world/src/worldstatic.cpp +++ b/src/jasper/modules/world/src/worldstatic.cpp @@ -161,9 +161,9 @@ ox::Result WorldStaticLoader::setupTileResrc(DocObjRef const&docObjRef) } auto const out = static_cast(m_worldStatic.objTileRefSets.size()); auto const&refSet = m_worldStatic.objTileRefSets.emplace_back(ObjTileRefSet{ - .palBank = obj->palBank, .tilesheetIdx = static_cast(*subsheetOffset), .cbbIdx = m_cbbIt, + .palBank = obj->palBank, .tilesheetId = tsIdx, .tileCnt = subsheetTileCnt(*subsheet), .frames = obj->frames,