From 6b37ae07ffe0d233b7ff54558d7d39e3e9035e0d Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 3 May 2015 20:23:43 +0200 Subject: Add font and fast programming to test the game --- src/Model/Game.cpp | 9 +++++++++ src/Model/Game.hpp | 2 ++ src/Model/Grid.cpp | 5 +++++ src/Model/Grid.hpp | 3 ++- 4 files changed, 18 insertions(+), 1 deletion(-) (limited to 'src/Model') diff --git a/src/Model/Game.cpp b/src/Model/Game.cpp index 284d82b..e2ac799 100644 --- a/src/Model/Game.cpp +++ b/src/Model/Game.cpp @@ -83,3 +83,12 @@ int Game::getScore(){ int Game::getNbMove(){ return m_nbMove; } + +std::vector > Game::getGrid(){ + return m_grid.getGrid(); +} + + +int Game::maxStrLenInGrid(){ + return m_grid.maxStrLenInGrid(); +} diff --git a/src/Model/Game.hpp b/src/Model/Game.hpp index 0b2ee4d..e5d19e5 100644 --- a/src/Model/Game.hpp +++ b/src/Model/Game.hpp @@ -35,6 +35,8 @@ class Game //Getters and Setters int getScore(); int getNbMove(); + int maxStrLenInGrid(); + std::vector > getGrid(); }; #endif diff --git a/src/Model/Grid.cpp b/src/Model/Grid.cpp index cc0fe60..7d23c6c 100644 --- a/src/Model/Grid.cpp +++ b/src/Model/Grid.cpp @@ -345,3 +345,8 @@ std::vector Grid::getCol(int col){ return colVect; } + + +std::vector > Grid::getGrid(){ + return m_grid; +} diff --git a/src/Model/Grid.hpp b/src/Model/Grid.hpp index 51168a9..604a6ff 100644 --- a/src/Model/Grid.hpp +++ b/src/Model/Grid.hpp @@ -21,7 +21,6 @@ class Grid int m_lastMoveScore; //Private methods - int maxStrLenInGrid(); public: //Constructor and Destructor @@ -34,6 +33,7 @@ class Grid std::vector rightMerge(std::vector line); std::vector leftMerge(std::vector line); + int maxStrLenInGrid(); //Swipe methods bool swipeRight(); bool swipeLeft(); @@ -55,6 +55,7 @@ class Grid std::vector getCol(int col); void setCol(int col, std::vector colVect); int getLastMoveScore(); + std::vector > getGrid(); }; -- cgit v1.2.3