Fixed bug related to types, added a map

Sokochez · Jan 2, 2017 · fe2c322 · fe2c322
1 parent 6f9d57d
commit fe2c322
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 8 deletions.
diff --git a/maps/blockemeet.txt → maps/blocksmeet/blockemeet.txt b/maps/blockemeet.txt → maps/blocksmeet/blockemeet.txt
diff --git a/maps/tresdur.txt → maps/blocksmeet/tresdur.txt b/maps/tresdur.txt → maps/blocksmeet/tresdur.txt
diff --git a/maps/clear/tstclr.txt b/maps/clear/tstclr.txt
@@ -0,0 +1,9 @@
+#######
+##    #
+#1   Cb
+##BA  #
+#  ## #
+#  a# ##
+# ##   #
+c     2#
+########
diff --git a/maps/chelou.txt → maps/playersmeet/chelou.txt b/maps/chelou.txt → maps/playersmeet/chelou.txt
diff --git a/maps/foomap.txt → maps/playersmeet/foomap.txt b/maps/foomap.txt → maps/playersmeet/foomap.txt
diff --git a/maps/jeej.txt → maps/playersmeet/jeej.txt b/maps/jeej.txt → maps/playersmeet/jeej.txt
diff --git a/maps/lol.txt → maps/playersmeet/lol.txt b/maps/lol.txt → maps/playersmeet/lol.txt
diff --git a/maps/map.txt → maps/playersmeet/map.txt b/maps/map.txt → maps/playersmeet/map.txt
diff --git a/src/.qmake.stash b/src/.qmake.stash
@@ -0,0 +1,13 @@
+QMAKE_DEFAULT_INCDIRS = \
+    /usr/include/c++/6.2.1 \
+    /usr/include/c++/6.2.1/x86_64-redhat-linux \
+    /usr/include/c++/6.2.1/backward \
+    /usr/lib/gcc/x86_64-redhat-linux/6.2.1/include \
+    /usr/local/include \
+    /usr/include
+QMAKE_DEFAULT_LIBDIRS = \
+    /usr/lib/gcc/x86_64-redhat-linux/6.2.1 \
+    /usr/lib64 \
+    /lib64 \
+    /usr/lib \
+    /lib
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
@@ -5,8 +5,8 @@ using namespace std;
 
 bool Move (CMatrix & Mat, GameObjects & Objects, CPosition & Pos, const int & DistX, const int & DistY)
 {
-    if (    (-DistY > int (Pos.second))
-            ||(-DistX > int (Pos.first))
+    if (    (-DistY > (int) Pos.second)
+            ||(-DistX > (int) Pos.first)
             ||(DistY + Pos.second >= Mat.size())
             ||(DistX + Pos.first >= Mat[Pos.second].size())
             ||(Mat[Pos.second + DistY][Pos.first + DistX] == KTokenWall))
@@ -153,11 +153,11 @@ void WriteRules (const char & GameMode)
 
 bool AreInContact (const CPosition & Pos1, const CPosition & Pos2)
 {
-    return ((Pos1.second == Pos2.second)
-            && (Pos1.first >= Pos2.first - 1)
-            && (Pos1.first <= Pos2.first + 1))
-            ||((Pos1.first == Pos2.first)
-            && (Pos1.second >= Pos2.second - 1)
-            && (Pos1.second <= Pos2.second + 1));
+    return ((( (int) Pos1.second == (int) Pos2.second)
+            && ((int) Pos1.first >= (int) Pos2.first - 1)
+            && ((int) Pos1.first <= (int) Pos2.first + 1))
+            ||(((int) Pos1.first == (int) Pos2.first)
+            && ((int) Pos1.second >= (int) Pos2.second - 1)
+            && ((int) Pos1.second <= (int) Pos2.second + 1)));
 
 } // AreInContact