diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-24 03:23:39 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-24 03:23:39 (GMT) |
| commit | fc3b11349015a34d292e1f2c2e03353ee6a799a0 (patch) | |
| tree | 86b177d361aa6f971b4674c04503af9d051a6e79 /src/displayapp/screens/Twos.cpp | |
| parent | 7be329691dc7f6a69d610c56fa2027c9e635e16a (diff) | |
| parent | a62b893469765923a113acdf85627ce39322880f (diff) | |
Merge ../../InfiniTime into HEAD
Diffstat (limited to 'src/displayapp/screens/Twos.cpp')
| -rw-r--r-- | src/displayapp/screens/Twos.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/screens/Twos.cpp b/src/displayapp/screens/Twos.cpp index b15332f..6d67585 100644 --- a/src/displayapp/screens/Twos.cpp +++ b/src/displayapp/screens/Twos.cpp @@ -130,7 +130,7 @@ bool Twos::placeNewTile() { } bool Twos::tryMerge(TwosTile grid[][4], int& newRow, int& newCol, int oldRow, int oldCol) { - if ((grid[newRow][newCol].value == grid[oldRow][oldCol].value)) { + if (grid[newRow][newCol].value == grid[oldRow][oldCol].value) { if ((newCol != oldCol) || (newRow != oldRow)) { if (!grid[newRow][newCol].merged) { unsigned int newVal = grid[oldRow][oldCol].value *= 2; |