Development 4 map

game/include/Map.hpp

@@ -7,7 +7,7 @@
 #include <string>
 
 using tileArray = boost::multi_array<Tile, 2>;
-using entityMap = std::map<uint32_t, entity::Entity>;
+using entityMap = std::map<uint32_t, Entity>;
 
 class Map {
    private:
@@ -20,15 +20,15 @@ class Map {
 
    public:
     Map();
-    Map(const uint16_t& id, const uint8_t& current_type, const std::string& map_name, const std::string& bitmap_name, const tileArray& tiles, const uint16_t& dimensionX, const uint16_t& dimensionY,
+    Map(const uint16_t& id, const uint8_t& current_type, const std::string& map_name, const std::string& bitmap_name, const tileArray& tiles, const uint16_t& length_x, const uint16_t& length_y,
         const entityMap& entities);
     ~Map();
 
     void setId(const uint16_t& id);
     void setCurrentType(const uint8_t& current_type);
     void setMapName(const std::string& map_name);
     void setBitmapName(const std::string& bitmap_name);
-    void setTiles(const tileArray tiles, const uint16_t& dimensionX, const uint16_t& dimensionY);
+    void setTiles(const tileArray tiles, const uint16_t& length_x, const uint16_t& length_y);
     void setEntities(const entityMap& entities);
     void setTile(const utils::Coordinate& coordinate, const Tile& tile);
 
@@ -39,7 +39,7 @@ class Map {
     const tileArray getTiles();
     const entityMap getEntities();
 
-    void swapTiles(Tile tile1, Tile Tile2);
+    void swapTiles(Tile tile_1, Tile tile_2);
 
     bool doesItCollide(const tils::Coordinate& coordinate, const uint8_t& direction);
     bool doesItInteract(const utils::Coordinate& coordinate, const uint8_t& direction);

game/src/Map.cpp

@@ -1,12 +1,14 @@
 #include <Map.hpp>
 
-Map::Map(const uint16_t& id, const uint8_t& current_type, const std::string& map_name, const std::string& bitmap_name, const tileArray& tiles, const uint16_t& dimensionX, const uint16_t& dimensionY,
+#include "spdlog/spdlog.h"
+
+Map::Map(const uint16_t& id, const uint8_t& current_type, const std::string& map_name, const std::string& bitmap_name, const tileArray& tiles, const uint16_t& length_x, const uint16_t& length_y,
          const entityMap& entities) {
     setId(id);
     setCurrentType(current_type);
     setMapName(map_name);
     setBitmapName(bitmap_name);
-    setTiles(tiles, dimensionX, dimensionY);
+    setTiles(tiles, length_x, length_y);
     setEntities(entities);
 }
 
@@ -16,11 +18,13 @@ void Map::setId(const uint16_t& id) { this->id_ = id; }
 void Map::setcurrentType(const uint8_t& current_type) { this->current_type_ = current_type; }
 void Map::setMapName(const std::string& map_name) { this->map_name_ = map_name; }
 void Map::setBitmapName(const std::string& bitmap_name) { this->bitmap_name_ = bitmap_name; }
-void Map::setTiles(const tileArray& tiles, const uint16_t& dimensionX, const uint16_t& dimensionY) {
-    if (dimensionX == 0 || dimensionY == 0) {
+void Map::setTiles(const tileArray& tiles, const uint16_t& length_x, const uint16_t& length_y) {
+    if (length_x == 0 || length_y == 0) {
+        SPDLOG_ERROR("The tile matrix that is being set has a dimension of value 0. Exiting. ");
+        throw;
         return;
     }
-    tiles_.resize(boost::extents[dimensionX][dimensionY]);
+    tiles_.resize(boost::extents[length_x][length_y]);
     this->tiles_ = tiles;
 }
 void Map::setEntities(const entityMap& entities) { this->entities_ = entities; }
@@ -33,10 +37,10 @@ const std::string Map::getBitmapName() { return bitmap_name_; }
 const tileArray Map::getTiles() { return tiles_; }
 const entityMap Map::getEntities() { return entities_; }
 
-void Map::swapTiles(Tile& tile1, Tile& tile2) {
-    Tile tiletmp = tile1;
-    tile1 = tile2;
-    tile2 = tiletmp;
+void Map::swapTiles(Tile& tile_1, Tile& tile_2) {
+    Tile tiletmp = tile_1;
+    tile_1 = tile_2;
+    tile_2 = tiletmp;
 }
 
 bool Map::doesItCollide(const utils::Coordinate& coordinate, const uint8_t& direction) {