diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2021-12-09 22:41:29 +0100 |
|---|---|---|
| committer | Kieran Cawthray <kieranc@gmail.com> | 2021-12-09 22:41:29 +0100 |
| commit | 6cf4a933b6323fc24a3b27ae55a3c12d31d6a841 (patch) | |
| tree | ffee2e59a62efe62aa8255f68e7cc89be1cad152 /src/displayapp/screens/Twos.h | |
| parent | ae4b9e0f2e877d200bd780f99e2a8952f9f8bf5b (diff) | |
| parent | 42a5cdb5b776c2cdeb08a8c6f26606282a809178 (diff) | |
Merge remote-tracking branch 'upstream/develop' into pts-settings
Diffstat (limited to 'src/displayapp/screens/Twos.h')
| -rw-r--r-- | src/displayapp/screens/Twos.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h index 48ea0794..5a0c4350 100644 --- a/src/displayapp/screens/Twos.h +++ b/src/displayapp/screens/Twos.h @@ -5,7 +5,7 @@ namespace Pinetime { namespace Applications { - struct Tile { + struct TwosTile { bool merged = false; unsigned int value = 0; }; @@ -26,11 +26,11 @@ namespace Pinetime { lv_obj_t* scoreText; lv_obj_t* gridDisplay; - Tile grid[4][4]; + TwosTile grid[4][4]; unsigned int score = 0; - void updateGridDisplay(Tile grid[][4]); - bool tryMerge(Tile grid[][4], int& newRow, int& newCol, int oldRow, int oldCol); - bool tryMove(Tile grid[][4], int newRow, int newCol, int oldRow, int oldCol); + void updateGridDisplay(TwosTile grid[][4]); + bool tryMerge(TwosTile grid[][4], int& newRow, int& newCol, int oldRow, int oldCol); + bool tryMove(TwosTile grid[][4], int newRow, int newCol, int oldRow, int oldCol); bool placeNewTile(); }; } |