From cfc5d425f68c1a98b86ef91d92ac82785d0f33a2 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 3 May 2015 01:09:19 +0200
Subject: Correct bug on merging and pop number

---
 src/Model/Grid.hpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/Model/Grid.hpp')

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();
 };
 
 
-- 
cgit v1.2.3