fixed merge

src/pacman.cpp

@@ -46,7 +46,7 @@ bool pacman::collisionDetection(mapObj mapObject, glm::vec3 tempCamPos, float di
     * Having 0.6 simply prevents us from seeing through the wall to a greater extent.
     */
     bool collisionX = tempCamPos.x >= (mapObject.pos.x*18.0f)- distFromSrc && tempCamPos.x <= (mapObject.pos.x*18.0f)+ distFromSrc;
-    bool collisionZ = tempCamPos.z >= (mapObject.pos.y*18.0f)- distFromSrc && tempCamPos.z <= (mapObject.pos.y*18.0f)+ distFromSrc;
+    bool collisionZ = tempCamPos.z >= (mapObject.pos.z*18.0f)- distFromSrc && tempCamPos.z <= (mapObject.pos.z*18.0f)+ distFromSrc;
     // NOTE!. mapObject.pos.y is really its z position. I just use a glm::vec2 since the "y" position doesnt matter for walls. The blocking wall's height is irrelevant since being on top of a wall isnt a necessary functionality
     
     /*