Merge branch 'develop'HEADmaster

	apply SFML develop change

1 files changed, 4 insertions, 2 deletions

diff --git a/src/Model/Grid.hpp b/src/Model/Grid.hpp
index 51168a9..22416b0 100644
--- a/src/Model/Grid.hpp
+++ b/src/Model/Grid.hpp
@@ -16,12 +16,12 @@ class Grid
 {
 	private:
 		//Members
-		int m_size;
+	protected:
 		std::vector<std::vector<int> > m_grid;
+		int m_size;
 		int m_lastMoveScore;
 
 		//Private methods
-		int maxStrLenInGrid();
 
 	public:
 		//Constructor and Destructor
@@ -34,6 +34,7 @@ class Grid
 		std::vector<int> rightMerge(std::vector<int> line);
 		std::vector<int> leftMerge(std::vector<int> line);
 
+		int maxStrLenInGrid();
 		//Swipe methods
 		bool swipeRight();
 		bool swipeLeft();
@@ -55,6 +56,7 @@ class Grid
 		std::vector<int> getCol(int col);
 		void setCol(int col, std::vector<int> colVect);
 		int getLastMoveScore();
+		std::vector<std::vector<int> > getGrid();
 };