* bumped version to 0.12

* fixed Ace/King/Queen round bug, allowing to start the round at any time

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.61])
-AC_INIT([NetMauMau], [0.11], [[email protected]], [netmaumau], [https://github.com/velnias75/NetMauMau])
+AC_INIT([NetMauMau], [0.12], [[email protected]], [netmaumau], [https://github.com/velnias75/NetMauMau])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip tar-pax no-installinfo no-texinfo.tex])
 AM_MAINTAINER_MODE

debian/changelog

@@ -1,3 +1,9 @@
+netmaumau (0.12) UNRELEASED; urgency=low
+
+  * fixed Ace/King/Queen round bug, allowing to start the round at any time
+
+ -- Heiko Schäfer <[email protected]>  Wed, 28 Jan 2015 13:00:38 +0100
+
 netmaumau (0.11) precise; urgency=low
 
   * improved AI opponent

src/engine/stdruleset.cpp

@@ -68,8 +68,11 @@ bool StdRuleSet::checkCard(const NetMauMau::Player::IPlayer *player,
 						   const NetMauMau::Common::ICard *uncoveredCard,
 						   const NetMauMau::Common::ICard *playedCard, bool /*ai*/) {
 
-	if(m_aceRound && uncoveredCard && (!m_aceRoundPlayer || m_aceRoundPlayer == player) &&
-			playedCard->getRank() == m_arl->getAceRoundRank()) {
+	const bool accepted = uncoveredCard ? checkCard(uncoveredCard, playedCard) : true;
+
+	if(accepted && (m_aceRound && uncoveredCard && (!m_aceRoundPlayer ||
+					m_aceRoundPlayer == player) && playedCard->getRank() ==
+					m_arl->getAceRoundRank())) {
 
 		const bool acrCont = m_aceRoundPlayer;
 
@@ -80,8 +83,6 @@ bool StdRuleSet::checkCard(const NetMauMau::Player::IPlayer *player,
 		}
 	}
 
-	const bool accepted = uncoveredCard ? checkCard(uncoveredCard, playedCard) : true;
-
 	m_hasToSuspend = accepted && playedCard->getRank() == NetMauMau::Common::ICard::EIGHT;
 	m_hasSuspended = false;
 

src/server/netmaumau.rc.in

@@ -20,8 +20,8 @@
 IDI_ICON1               ICON    DISCARDABLE     "@top_srcdir@/netmaumau.ico"
 
 1 VERSIONINFO
- FILEVERSION 0,0,11,0
- PRODUCTVERSION 0,0,11,0
+ FILEVERSION 0,0,12,0
+ PRODUCTVERSION 0,0,12,0
  FILEFLAGSMASK 0x17L
 #ifndef NDEBUG
  FILEFLAGS 0x1L