summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/Twos.cpp
diff options
context:
space:
mode:
authorJF002 <JF002@users.noreply.github.com>2021-04-09 20:43:39 +0200
committerGitHub <noreply@github.com>2021-04-09 20:43:39 +0200
commit17a37acaa81278cc8c782d84d994d4ca938ef006 (patch)
tree3c15890315a420417cd96b82103da80c84ed562d /src/displayapp/screens/Twos.cpp
parent04fc33e2d479161ec261f932b908dffbd73e227f (diff)
parent3685095da0d01f137692f80df2c267a8b90da715 (diff)
Merge pull request #258 from joaquimorg/BigRewrite
New settings menu and more...
Diffstat (limited to 'src/displayapp/screens/Twos.cpp')
-rw-r--r--src/displayapp/screens/Twos.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/displayapp/screens/Twos.cpp b/src/displayapp/screens/Twos.cpp
index b51a9ec6..7a3ed1e4 100644
--- a/src/displayapp/screens/Twos.cpp
+++ b/src/displayapp/screens/Twos.cpp
@@ -101,11 +101,6 @@ bool Twos::Refresh() {
return running;
}
-bool Twos::OnButtonPushed() {
- running = false;
- return true;
-}
-
bool Twos::placeNewTile() {
std::vector< std::pair <int,int> > availableCells;
for(int row = 0; row < 4; row++) {
@@ -158,8 +153,7 @@ bool Twos::tryMove(Tile grid[][4], int newRow, int newCol, int oldRow, int oldCo
}
bool Twos::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
- bool validMove;
- validMove = false;
+ bool validMove = false;
for(int row = 0; row < 4; row++) {
for(int col = 0; col < 4; col++) {
grid[row][col].merged = false; // reinitialize merge state