diff --git a/MultiSource/Applications/hexxagon/hexxagonboard.h b/MultiSource/Applications/hexxagon/hexxagonboard.h --- a/MultiSource/Applications/hexxagon/hexxagonboard.h +++ b/MultiSource/Applications/hexxagon/hexxagonboard.h @@ -39,7 +39,7 @@ { pl1 = 1, pl2, - empty, + empty_var, removed }; diff --git a/MultiSource/Applications/hexxagon/hexxagonboard.cpp b/MultiSource/Applications/hexxagon/hexxagonboard.cpp --- a/MultiSource/Applications/hexxagon/hexxagonboard.cpp +++ b/MultiSource/Applications/hexxagon/hexxagonboard.cpp @@ -251,7 +251,7 @@ else return pl2; } else - return empty; + return empty_var; } int HexxagonBoard::applyMove(HexxagonMove &move) @@ -424,12 +424,12 @@ cout << "\n"; } - int empty = 61 - ((turn ? countBricks(1) : countBricks(2)) + + int empty_var = 61 - ((turn ? countBricks(1) : countBricks(2)) + (turn ? countBricks(2) : countBricks(1))); cout << "\nBricks: x " << (turn ? countBricks(1) : countBricks(2)); cout << ", o " << (turn ? countBricks(2) : countBricks(1)); - cout << ". Empty " << empty << ".\n"; + cout << ". Empty " << empty_var << ".\n"; cout << "Next to move: " << (turn ? "x" : "o"); cout << (endOfGame() ? ", Game over." : "") << "\n"; }