diff --git a/src/jasper/modules/world/src/world.cpp b/src/jasper/modules/world/src/world.cpp index 6dbe523..3ebe5f5 100644 --- a/src/jasper/modules/world/src/world.cpp +++ b/src/jasper/modules/world/src/world.cpp @@ -32,7 +32,8 @@ ox::Error World::setupDisplay() noexcept { OX_RETURN_ERROR(ncore::loadBgPalette(m_nctx, i, palAddr)); ++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( m_nctx, rs.cbb, diff --git a/src/jasper/modules/world/src/worldstatic.cpp b/src/jasper/modules/world/src/worldstatic.cpp index d0dd1bd..a668a95 100644 --- a/src/jasper/modules/world/src/worldstatic.cpp +++ b/src/jasper/modules/world/src/worldstatic.cpp @@ -92,7 +92,18 @@ void WorldStaticLoader::loadTile(TileStatic &dst, TileDoc const&src) noexcept { } void WorldStaticLoader::reset() { - m_worldStatic = {}; + m_worldStatic = { + .objTileRefSets{ + ObjTileRefSet{ + .cbb = 0, + }, + }, + .tilesheets{}, + .palettes{}, + .columns{}, + .rows{}, + .map{}, + }; m_cache.clear(); m_objSets.clear(); m_cbbIt = 4;