diff options
Diffstat (limited to 'src/Model')
| -rw-r--r-- | src/Model/Game.cpp | 9 | ||||
| -rw-r--r-- | src/Model/Game.hpp | 2 | ||||
| -rw-r--r-- | src/Model/Grid.cpp | 5 | ||||
| -rw-r--r-- | src/Model/Grid.hpp | 3 |
4 files changed, 18 insertions, 1 deletions
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<std::vector<int> > 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<std::vector<int> > 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<int> Grid::getCol(int col){ return colVect; } + + +std::vector<std::vector<int> > 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<int> rightMerge(std::vector<int> line); std::vector<int> leftMerge(std::vector<int> line); + int maxStrLenInGrid(); //Swipe methods bool swipeRight(); bool swipeLeft(); @@ -55,6 +55,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(); }; |
