From 0c2cd251fa0427b19f7c995bc7da7319d2ac80a5 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 9 Feb 2021 19:39:30 -0500
Subject: Maps can contain named points of interest called warps

---
 res/maps/map1.tmx | 5 ++++-
 src/main.cpp      | 2 +-
 src/map.cpp       | 6 ++++++
 src/map.h         | 4 ++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/res/maps/map1.tmx b/res/maps/map1.tmx
index 6ad312b..d830158 100644
--- a/res/maps/map1.tmx
+++ b/res/maps/map1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="5">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="6">
  <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount="240" columns="10">
   <image source="map1_tiles.png" width="160" height="384"/>
   <tile id="77">
@@ -771,6 +771,9 @@
    </properties>
    <point/>
   </object>
+  <object id="5" name="spawn" type="warp" x="201.931" y="284.096">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Layer 0" width="48" height="32">
   <data encoding="csv">
diff --git a/src/main.cpp b/src/main.cpp
index b1fc373..62c81f3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,7 +26,7 @@ void loop(Renderer& renderer) {
   game.setMap(std::move(map));
 
   int lucasSprite = game.emplaceSprite("lucas");
-  game.getSystem<TransformSystem>().initSprite(lucasSprite, {32, 32});
+  game.getSystem<TransformSystem>().initSprite(lucasSprite, game.getMap().getWarpPoint("spawn"));
   game.getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8});
   game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt", renderer);
   game.getSprite(lucasSprite).controllable = true;
diff --git a/src/map.cpp b/src/map.cpp
index 1a2a250..2214d17 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -78,6 +78,12 @@ Map::Map(std::string_view filename, Renderer& renderer) {
           }
 
           prototypes_.push_back(std::move(p));
+        } else if (object.getType() == "warp") {
+          vec2i point;
+          point.x() = object.getPosition().x;
+          point.y() = object.getPosition().y;
+
+          warpPoints_[object.getName()] = std::move(point);
         }
       }
     }
diff --git a/src/map.h b/src/map.h
index a896b00..7bfb15e 100644
--- a/src/map.h
+++ b/src/map.h
@@ -1,6 +1,7 @@
 #ifndef MAP_H_D95D6D47
 #define MAP_H_D95D6D47
 
+#include <map>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -48,6 +49,8 @@ public:
 
   const std::vector<Prototype>& getPrototypes() const { return prototypes_; }
 
+  const vec2i& getWarpPoint(const std::string& name) const { return warpPoints_.at(name); }
+
 private:
 
   vec2i mapSize_;
@@ -56,6 +59,7 @@ private:
   int tilesetTextureId_;
   int tilesetColumns_;
   std::vector<Prototype> prototypes_;
+  std::map<std::string, vec2i> warpPoints_;
 };
 
 #endif /* end of include guard: MAP_H_D95D6D47 */
-- 
cgit 1.4.1