1 files changed, 22 insertions, 3 deletions

@@ -50,7 +50,18 @@ Map::Map(std::string_view name) : name_(name) {
         tilesToStore.push_back(std::move(tile));
       }
 
-      layers_.push_back(std::move(tilesToStore));
+      bool above = false;
+      for (const tmx::Property& property : tileLayer.getProperties()) {
+        if (property.getName() == "above" && property.getBoolValue()) {
+          above = true;
+        }
+      }
+
+      if (above) {
+        upperLayers_.push_back(std::move(tilesToStore));
+      } else {
+        lowerLayers_.push_back(std::move(tilesToStore));
+      }
     } else if (layer->getType() == tmx::Layer::Type::Object) {
       const auto& objectLayer = layer->getLayerAs<tmx::ObjectGroup>();
 
@@ -137,9 +148,13 @@ Map::Map(std::string_view name) : name_(name) {
 }
 
 bool Map::isBlocked(int x, int y) const {
+  if (x < 0 || y < 0 || x >= mapSize_.w() || y >= mapSize_.h()) {
+    return false;
+  }
+
   int i = x + y * mapSize_.w();
 
-  for (const std::vector<Tile>& layer : layers_) {
+  for (const std::vector<Tile>& layer : lowerLayers_) {
     if (layer.at(i).blocked) {
       return true;
     }
@@ -149,9 +164,13 @@ bool Map::isBlocked(int x, int y) const {
 }
 
 StepType Map::getStepType(int x, int y) const {
+  if (x < 0 || y < 0 || x >= mapSize_.w() || y >= mapSize_.h()) {
+    return StepType::none;
+  }
+
   int i = x + y * mapSize_.w();
 
-  for (const std::vector<Tile>& layer : layers_) {
+  for (const std::vector<Tile>& layer : lowerLayers_) {
     if (layer.at(i).step != StepType::none) {
       return layer.at(i).step;
     }