a_dinosaur/tmx2gba
1
0
Fork 0
mirror of https://github.com/ScrelliCopter/tmx2gba.git synced 2025-02-21 03:29:25 +11:00
Code Issues Releases Activity

zstd support

Browse Source
This commit is contained in:
a dinosaur
2024-03-25 22:24:26 +11:00
parent b43b39b8b8
commit fb7cef3bc8
97 changed files with 76282 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tmxreader.cpp
View File

@@ -34,12 +34,18 @@ TmxReader::Error TmxReader::Open(const std::string& inPath,
auto name = layer->getName();
if (layer->getType() == tmx::Layer::Type::Tile)
{
const auto& tileLayer = layer->getLayerAs<TileLayer>();
// tmxlite unfortunately has no error reporting when a layer fails to load,
// empty check will suffice for the time being
if (tileLayer.getTiles().empty())
continue;
if (layerGfx == std::nullopt && (graphicsName.empty() || name == graphicsName))
layerGfx = layer->getLayerAs<TileLayer>();
layerGfx = tileLayer;
if (!collisionName.empty() && layerCls == std::nullopt && name == collisionName)
layerCls = layer->getLayerAs<TileLayer>();
layerCls = tileLayer;
if (!paletteName.empty() && layerPal == std::nullopt && name == paletteName)
layerPal = layer->getLayerAs<TileLayer>();
layerPal = tileLayer;
}
else if (!objMapping.empty() && layer->getType() == tmx::Layer::Type::Object)
{
@@ -70,7 +76,7 @@ TmxReader::Error TmxReader::Open(const std::string& inPath,
mGraphics.emplace_back(Tile { tmxTile.ID, tmxTile.flipFlags });
// Read optional layers
if (layerPal != std::nullopt)
if (layerPal.has_value())
{
std::vector<uint32_t> v;
v.reserve(numTiles);
@@ -78,7 +84,7 @@ TmxReader::Error TmxReader::Open(const std::string& inPath,
v.emplace_back(tmxTile.ID);
mPalette.emplace(v);
}
if (layerCls != std::nullopt)
if (layerCls.has_value())
{
std::vector<uint32_t> v;
v.reserve(numTiles);