summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Model/Game.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/Model/Game.cpp b/src/Model/Game.cpp
index aa3626c..069a481 100644
--- a/src/Model/Game.cpp
+++ b/src/Model/Game.cpp
@@ -2,53 +2,53 @@
Game::Game()
{
- m_grid = new Grid(4);
+ m_grid = new Grid(4);
}
Game::~Game()
{
- delete m_grid;
+ delete m_grid;
}
void Game::play()
{
- while(!m_grid->gridIsFull())
- {
- m_grid->show();
+ while(!m_grid->gridIsFull())
+ {
+ m_grid->show();
- pop();
- std::cout << std::endl;
- }
+ pop();
+ std::cout << std::endl;
+ }
- m_grid->show();
+ m_grid->show();
}
void Game::showGrid()
{
- m_grid->show();
- std::cout << std::endl;
+ m_grid->show();
+ std::cout << std::endl;
}
void Game::pop()
{
- bool cellChosen = false;
+ bool cellChosen = false;
- int i;
- int j;
+ int i;
+ int j;
- while(!cellChosen)
- {
- i = rand() % 4;
- j = rand() % 4;
+ while(!cellChosen)
+ {
+ i = rand() % 4;
+ j = rand() % 4;
- if (m_grid->isEmpty(i,j))
- cellChosen = true;
- }
+ if (m_grid->isEmpty(i,j))
+ cellChosen = true;
+ }
- m_grid->setCell(i, j, new Cell("2"));
+ m_grid->setCell(i, j, new Cell("2"));
}
bool Game::isOver()
{
- return m_grid->gridIsFull();
+ return m_grid->gridIsFull();
}