summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/Twos.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp/screens/Twos.h')
-rw-r--r--src/displayapp/screens/Twos.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h
index 6d85cff6..5a0c4350 100644
--- a/src/displayapp/screens/Twos.h
+++ b/src/displayapp/screens/Twos.h
@@ -1,11 +1,11 @@
#pragma once
#include <lvgl/src/lv_core/lv_obj.h>
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
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();
};
}