Merge pull request #1034 from NeroBurner/twos_comparison_warning

JF002 · web-flow · commit fc374562ddd8 · 2022-03-14T21:21:11.000+01:00
Twos: fix warning about extra paranthesis
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ bool Twos::placeNewTile() {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`bool Twos::tryMerge(TwosTile grid[][4], int& newRow, int& newCol, int oldRow, int oldCol) {`
`133`		`- if ((grid[newRow][newCol].value == grid[oldRow][oldCol].value)) {`
	`133`	`+ if (grid[newRow][newCol].value == grid[oldRow][oldCol].value) {`
`134`	`134`	`if ((newCol != oldCol) \|\| (newRow != oldRow)) {`
`135`	`135`	`if (!grid[newRow][newCol].merged) {`
`136`	`136`	`unsigned int newVal = grid[oldRow][oldCol].value *= 2;`