Merge pull request #1034 from NeroBurner/twos_comparison_warning
Twos: fix warning about extra paranthesis
This commit is contained in:
commit
fc374562dd
|
@ -130,7 +130,7 @@ bool Twos::placeNewTile() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Twos::tryMerge(TwosTile grid[][4], int& newRow, int& newCol, int oldRow, int oldCol) {
|
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 ((newCol != oldCol) || (newRow != oldRow)) {
|
||||||
if (!grid[newRow][newCol].merged) {
|
if (!grid[newRow][newCol].merged) {
|
||||||
unsigned int newVal = grid[oldRow][oldCol].value *= 2;
|
unsigned int newVal = grid[oldRow][oldCol].value *= 2;
|
||||||
|
|
Loading…
Reference in a new issue