drinkingtea/jasper
drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

[jasper/world] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2025-01-19 20:00:27 -06:00
parent b05f807cd3
commit 27a2c8b47c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jasper/modules/world/src/world.cpp
View File

@ -35,8 +35,8 @@ ox::Error World::setupDisplay() noexcept {
} }
++objIdx; ++objIdx;
} }
auto &kctx = keelCtx(m_nctx);
if (m_tilesheets.empty()) { if (m_tilesheets.empty()) {
auto &kctx = keelCtx(m_nctx);
for (auto const&tsAddr : m_worldStatic.tilesheets) { for (auto const&tsAddr : m_worldStatic.tilesheets) {
OX_REQUIRE_M(ts, keel::readObj<ncore::CompactTileSheet>(kctx, tsAddr)); OX_REQUIRE_M(ts, keel::readObj<ncore::CompactTileSheet>(kctx, tsAddr));
m_tilesheets.emplace_back(std::move(ts)); m_tilesheets.emplace_back(std::move(ts));
@ -86,7 +86,7 @@ void World::setupTile(
auto &t = tile(m_worldStatic, lyr, x, y); auto &t = tile(m_worldStatic, lyr, x, y);
auto const tx = static_cast<int>(x) * 2; auto const tx = static_cast<int>(x) * 2;
auto const ty = static_cast<int>(y) * 2; auto const ty = static_cast<int>(y) * 2;
auto const &obj = m_worldStatic.objTileRefSets[t.objIdxRefSet];; auto const &obj = m_worldStatic.objTileRefSets[t.objIdxRefSet];
ncore::setBgTile(m_nctx, lyr, tx + 0, ty + 0, { ncore::setBgTile(m_nctx, lyr, tx + 0, ty + 0, {
.tileIdx = static_cast<uint_t>(obj.cbbIdx + 0), .tileIdx = static_cast<uint_t>(obj.cbbIdx + 0),
.palBank = obj.palBank, .palBank = obj.palBank,