Mercurial > mm7

changeset 2478:e54f5bfe8f1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Thu, 21 Aug 2014 23:28:48 +0200
parents fd99ee46b301 (current diff) faf21e357a83 (diff)
children 24fd08aef81e
files
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Arcomage.cpp	Thu Aug 21 23:27:15 2014 +0200
+++ b/Arcomage.cpp	Thu Aug 21 23:28:48 2014 +0200
@@ -1082,13 +1082,15 @@
       while ( 1 )
       {
         byte_4FAA24 = PlayerTurn(current_player_num);
-        if ( GetPlayerHandCardCount(current_player_num) <= minimum_cards_at_hand )
-          break;
+		if (GetPlayerHandCardCount(current_player_num) <= minimum_cards_at_hand)
+		{
+			need_to_discard_card = 0;
+			break;
+		}
         need_to_discard_card = 1;
 		if (pArcomageGame->field_F4)
-			continue;
+			break;
       }
-      need_to_discard_card = 0;
     }
     pArcomageGame->GameOver = IsGameOver();
     if ( !pArcomageGame->GameOver )