Correct bug on merging and pop number

1 files changed, 9 insertions, 6 deletions

diff --git a/src/Model/Grid.hpp b/src/Model/Grid.hpp
index 2f5160e..09f3e5e 100644
--- a/src/Model/Grid.hpp
+++ b/src/Model/Grid.hpp
@@ -31,8 +31,10 @@ class Grid
 		bool setCell(int i, int j, int value);
 
 		std::vector<int> swipeLine(std::vector<int> line);
-		std::vector<int> defragmentLine(std::vector<int> line);
-		std::vector<int> mergeLine(std::vector<int> line);
+		std::vector<int> rightDefragment(std::vector<int> line);
+		std::vector<int> leftDefragment(std::vector<int> line);
+		std::vector<int> rightMerge(std::vector<int> line);
+		std::vector<int> leftMerge(std::vector<int> line);
 
 		std::vector<int> getCol(int col);
 
@@ -41,12 +43,13 @@ class Grid
 
 		void setCol(int col, std::vector<int> colVect);
 		std::vector<int> reverseLine(std::vector<int> line);
+		bool compareLines(std::vector<int> line1, std::vector<int> line2);
 
 		//Moves
-		void swipeRight();
-		void swipeLeft();
-		void swipeUp();
-		void swipeDown();
+		bool swipeRight();
+		bool swipeLeft();
+		bool swipeUp();
+		bool swipeDown();
 };