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

[jasper/world] Give world static a default obj ref set
All checks were successful
Build / build (push) Successful in 3m42s
Details

Browse Source
This commit is contained in:
Gary Talent 2025-01-11 19:38:45 -06:00
parent 58b0254ff5
commit c774b5da70
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,8 @@ ox::Error World::setupDisplay() noexcept {
OX_RETURN_ERROR(ncore::loadBgPalette(m_nctx, i, palAddr)); OX_RETURN_ERROR(ncore::loadBgPalette(m_nctx, i, palAddr));
++i; ++i;
} }
for (auto const&rs : m_worldStatic.objTileRefSets) { for (size_t i = 1; i < m_worldStatic.objTileRefSets.size(); ++i) {
auto const&rs = m_worldStatic.objTileRefSets[i];
OX_RETURN_ERROR(ncore::loadBgTileSheet( OX_RETURN_ERROR(ncore::loadBgTileSheet(
m_nctx, m_nctx,
rs.cbb, rs.cbb,

13
src/jasper/modules/world/src/worldstatic.cpp
View File

@ -92,7 +92,18 @@ void WorldStaticLoader::loadTile(TileStatic &dst, TileDoc const&src) noexcept {
} }
void WorldStaticLoader::reset() { void WorldStaticLoader::reset() {
m_worldStatic = {}; m_worldStatic = {
.objTileRefSets{
ObjTileRefSet{
.cbb = 0,
},
},
.tilesheets{},
.palettes{},
.columns{},
.rows{},
.map{},
};
m_cache.clear(); m_cache.clear();
m_objSets.clear(); m_objSets.clear();
m_cbbIt = 4; m_cbbIt = 4;