2 files changed, 18 insertions, 1 deletions

@@ -59,7 +59,9 @@ void Game::loadMap(std::string filename, std::string warpPoint, Direction dir) {
     int spriteId = emplaceSprite(p.name);
     getSystem<TransformSystem>().initSprite(spriteId, p.pos);
     getSystem<TransformSystem>().setUpCollision(spriteId, p.collisionOffset, p.collisionSize, true);
-    getSystem<AnimationSystem>().initSprite(spriteId, p.animationFilename);
+    if (!p.animationFilename.empty()) {
+      getSystem<AnimationSystem>().initSprite(spriteId, p.animationFilename);
+    }
     getSprite(spriteId).interactionScript = p.interactionScript;
   }
 
@@ -99,6 +99,21 @@ Map::Map(std::string_view name) : name_(name) {
           }
 
           triggers_.push_back(std::move(t));
+        } else if (object.getType() == "tileSprite") {
+          Prototype p;
+          p.name = object.getName();
+          p.pos.x() = std::floor(object.getPosition().x / 16) * 16;
+          p.pos.y() = std::floor(object.getPosition().y / 16) * 16;
+          p.collisionOffset = { 0, 0 };
+          p.collisionSize = { 16, 16 };
+
+          for (const tmx::Property& property : object.getProperties()) {
+            if (property.getName() == "interactionScript") {
+              p.interactionScript = property.getStringValue();
+            }
+          }
+
+          prototypes_.push_back(std::move(p));
         }
       }
     }