Updated collision algorithm, misc changes

include/Collision.h

@@ -2,9 +2,11 @@
 #define COLLISION_H
 
 #include <SFML/Graphics.hpp>
+#include <unordered_set>
 #include <vector>
 #include <string>
 
+
 class Collision
 {
     public:
@@ -27,7 +29,7 @@ class Collision
         void positionBoundaryCollisionBoxes();
 
         //Place the collision boxes at certain points in the level.
-        void positionWorldCollisionBoxes(const std::vector<long int> &level, std::string world);
+        void positionWorldCollisionBoxes(const std::vector<long int> &level, const std::unordered_set<int> &objectsToCollideWith);
 
         //Reset the collision boxes by placing them at 0,0.
         void resetCollision();

include/Config.h

@@ -2,6 +2,7 @@
 #define CONFIG_H
 
 #include <SFML/Graphics.hpp>
+#include <unordered_set>
 #include <string>
 
 class Config
@@ -16,6 +17,10 @@ class Config
         //The level that is loaded
         std::string LEVEL_STRING = "grassland";
 
+        const std::unordered_set<int> objectsInGrassland = {3, 6, 7, 10, 11, 12};
+        const std::unordered_set<int> objectsInFarmland = {3, 7, 8};
+        const std::unordered_set<int> objectsInAnimprop = {1, 4};
+
     private:
         //The window name
         std::string appName = "World Testing";

map/shop.map

@@ -0,0 +1,16 @@
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000
+0000000000000000

src/Collision.cpp

@@ -93,9 +93,10 @@ void Collision::positionBoundaryCollisionBoxes()
     }
 }
 
-void Collision::positionWorldCollisionBoxes(const std::vector<long int> &level, std::string world)
+void Collision::positionWorldCollisionBoxes(const std::vector<long int> &level,
+                            const std::unordered_set<int> &objectsToCollideWith)
 {
-    //For LEVEL_STRING
+    //For our unordered sets
     Config config;
 
     resetCollision();
@@ -110,22 +111,8 @@ void Collision::positionWorldCollisionBoxes(const std::vector<long int> &level,
             y += 32;
         }
         //The world objects we should collide with per map basis.
-        if (world == "grassland") {
-            if (level[i] == 3 || level[i] == 6 || level[i] == 7 || level[i] == 10 ||
-                        level[i] == 11 || level[i] == 12) {
-
-                collVector[i]->setPosition(x, y - 32);
-            }
-        }
-        if (world == "farmland") {
-            if (level[i] == 3 || level[i] == 7 || level[i] == 8) {
-                collVector[i]->setPosition(x, y - 32);
-            }
-        }
-        if (world == "animprops") {
-            if (level[i] == 1 || level[i] == 4) {
-                collVector[i]->setPosition(x, y - 32);
-            }
+        if (objectsToCollideWith.count(level[i])) {
+            collVector[i]->setPosition(x, y - 32);
         }
     }
 }

src/main.cpp

@@ -97,9 +97,9 @@ int main()
     //Position collision boxes on the edge of the map
     collision.positionBoundaryCollisionBoxes();
     //Position our world/level collision boxes
-    grasslandCollision.positionWorldCollisionBoxes(grassland.currentLevel, "grassland");
-    farmlandCollision.positionWorldCollisionBoxes(farmland.currentLevel, "farmland");
-    animPropsCollision.positionWorldCollisionBoxes(animPropsWorld.currentLevel, "animprops");
+    grasslandCollision.positionWorldCollisionBoxes(grassland.currentLevel, config.objectsInGrassland);
+    farmlandCollision.positionWorldCollisionBoxes(farmland.currentLevel, config.objectsInFarmland);
+    animPropsCollision.positionWorldCollisionBoxes(animPropsWorld.currentLevel, config.objectsInAnimprop);
     //Position the collision boxes for our flags
     for (int i = 0; i < flagsCollision.MAX_COLLISION_BOXES; ++i) {
         flagsCollision.collVector[i]->setPosition(0, 0);