diff options
author | Avamander <avamander@gmail.com> | 2021-12-05 22:22:06 +0200 |
---|---|---|
committer | JF <JF002@users.noreply.github.com> | 2021-12-09 21:30:04 +0100 |
commit | 6a442b90a1d310d082e2626128d0f2bf8e932851 (patch) | |
tree | 9dbed1540a3e7b35a6e8426c1719be6618a9e242 /src/displayapp/screens/Twos.h | |
parent | 645f6f43dc956e90243aa9230876e537af84e1f6 (diff) |
Improved format specifiers, bracing, removed C-style casts, whitespace fixes and removed Tiles shadowing
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(); }; } |