Fix problems with "ex n" where n is a number.

Found a crash where you enter "ex 4" twice,
and it would crash.  This led me to look up
how this was implemented, and it wasn't
very robust.  It also didn't save properly in
the GCG.  So I created a new move type
which I called a BlindExchange and implemented
it throughout the system.

1 files changed, 6 insertions, 1 deletions

diff --git a/game.cpp b/game.cpp
index 845e864..242556c 100644
--- a/game.cpp
+++ b/game.cpp
@@ -357,6 +357,11 @@ int GamePosition::validateMove(const Move &move) const
 		}
 		break;
 
+	case Move::BlindExchange:
+		if (!exchangeAllowed())
+			ret |= TooLateExchange;
+		break;
+
 	case Move::UnusedTilesBonus:
 	case Move::TimePenalty:
 		ret = InvalidAction;
@@ -783,7 +788,7 @@ bool GamePosition::incrementTurn()
 			}
 		}
 
-		if ((m_moveMade.action == Move::Place && m_moveMade.effectiveScore() == 0) || m_moveMade.action == Move::Exchange || m_moveMade.action == Move::Pass)
+		if ((m_moveMade.action == Move::Place && m_moveMade.effectiveScore() == 0) || m_moveMade.action == Move::Exchange || m_moveMade.action == Move::BlindExchange || m_moveMade.action == Move::Pass)
 			++m_scorelessTurnsInARow;
 		else
 			m_scorelessTurnsInARow = 0;