aboutsummaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-03-19 12:18:52 +0100
committerCharles <sircharlesaze@gmail.com>2020-03-19 12:18:52 +0100
commitc435852cc6147a0af23ef12cc0a07a195ac60756 (patch)
tree46797e58189fca8946f752ed20c24e2ccf609f32 /src/game.cpp
parentce65a7e1f682fa31934c05623c41ea25d9b71ce7 (diff)
download2048-c435852cc6147a0af23ef12cc0a07a195ac60756.tar.gz
2048-c435852cc6147a0af23ef12cc0a07a195ac60756.tar.bz2
2048-c435852cc6147a0af23ef12cc0a07a195ac60756.zip
Added score
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 2ef3c15..b505f9f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -6,9 +6,14 @@ Game::Game(int s)
size = s;
grid = new int*[size];
for (int i = 0; i < size; i++)
+ {
grid[i] = new int[size];
+ for (int j = 0; j < size; j++)
+ grid[i][j] = 0;
+ }
spawn();
spawn();
+ score = 0;
}
Game::~Game()
@@ -21,6 +26,11 @@ int Game::getSize()
return size;
}
+int Game::getScore()
+{
+ return score;
+}
+
int Game::at(int x, int y)
{
return grid[y][x];
@@ -145,6 +155,7 @@ void Game::mergeRow(std::vector<int> &row)
if (row[curr + 1] == row[curr])
{
row[curr] *= 2;
+ score += row[curr];
row[curr + 1] = 0;
for (size_t i = curr + 1; i < row.size() - 1; i++)
row[i] = row[i + 1];