Spawnblocked map sprites with already-used names

i.e. Map prototypes and triggers will not be instantiated upon loading the map if there is a persistent sprite with the same name. This is important because the Claus that joins your party is originally a map prototype.

1 files changed, 4 insertions, 0 deletions

@@ -52,6 +52,8 @@ void Game::loadMap(std::string filename) {
   map_ = std::make_unique<Map>(filename);
 
   for (const Prototype& p : map_->getPrototypes()) {
+    if (spritesByAlias_.count(p.name)) continue;
+
     int spriteId = emplaceSprite(p.name);
     getSystem<TransformSystem>().initSprite(spriteId, p.pos);
     getSystem<TransformSystem>().setUpCollision(spriteId, p.collisionOffset, p.collisionSize, true);
@@ -63,6 +65,8 @@ void Game::loadMap(std::string filename) {
   }
 
   for (const Trigger& t : map_->getTriggers()) {
+    if (spritesByAlias_.count(t.name)) continue;
+
     int spriteId = emplaceSprite(t.name);
     getSystem<TransformSystem>().initSprite(spriteId, t.pos);
     getSystem<TransformSystem>().setUpCollision(spriteId, {0, 0}, t.size, false);