aboutsummaryrefslogtreecommitdiff
path: root/mwe/resource-manager/tiledMap.cpp
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-11-15 20:39:07 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-11-15 20:39:07 +0100
commite8cd950b8ebd152d76d588d4fedc7f4c239b0835 (patch)
tree7919d13a79d52f1365bc19bf1b435a6264ee5512 /mwe/resource-manager/tiledMap.cpp
parent5bee4515c1089ce3499bc3b74780db94f0c02306 (diff)
parent9f6475e7b0698c414138e2a8140b47f01ce9c5d1 (diff)
merge `master` into `loek/cleanup`
Diffstat (limited to 'mwe/resource-manager/tiledMap.cpp')
-rw-r--r--mwe/resource-manager/tiledMap.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/mwe/resource-manager/tiledMap.cpp b/mwe/resource-manager/tiledMap.cpp
index 836929c..85fc30e 100644
--- a/mwe/resource-manager/tiledMap.cpp
+++ b/mwe/resource-manager/tiledMap.cpp
@@ -49,8 +49,7 @@ void TiledMap::SetMapTextures() {
for (const auto & ts : tileSets) {
m_MapTextures.emplace_back(new TextureMap);
- if (!m_MapTextures.back()->loadFromFile(ts.getImagePath(),
- m_Renderer)) {
+ if (!m_MapTextures.back()->loadFromFile(ts.getImagePath(), m_Renderer)) {
std::cerr << "Failed opening " << ts.getImagePath() << "\n";
}
}
@@ -63,8 +62,7 @@ void TiledMap::SetMapLayers() {
for (auto i = 0u; i < mapLayers.size(); ++i) {
if (mapLayers[i]->getType() == tmx::Layer::Type::Tile) {
m_RenderLayers.emplace_back(new MapLayer);
- m_RenderLayers.back()->create(this->m_TmxMap, i,
- this->m_MapTextures);
+ m_RenderLayers.back()->create(this->m_TmxMap, i, this->m_MapTextures);
}
}
}