# HG changeset patch
# User Ritor1
# Date 1408684027 -21600
# Node ID 24fd08aef81e9910151d8ec1d49128051a7bc6be
# Parent  908baf8e7d2316d7f597d933fbeb518996ee2090# Parent  e54f5bfe8f1a5c402c8cf416ce69b5d468dd4045
Слияние

diff -r 908baf8e7d23 -r 24fd08aef81e Arcomage.cpp
--- a/Arcomage.cpp	Fri Aug 22 11:06:51 2014 +0600
+++ b/Arcomage.cpp	Fri Aug 22 11:07:07 2014 +0600
@@ -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 )
diff -r 908baf8e7d23 -r 24fd08aef81e Spells.cpp
--- a/Spells.cpp	Fri Aug 22 11:06:51 2014 +0600
+++ b/Spells.cpp	Fri Aug 22 11:07:07 2014 +0600
@@ -333,7 +333,7 @@
 	strtok(pSpellsTXT_Raw, "\r");
 	for(int i=1; i<100; ++i) 
   {
-    if ((i % (11 - 1) )==0)
+    if (((i % 11) - 1 )==0)
       strtok(NULL, "\r");
     test_string=strtok(NULL, "\r")+1;
     auto tokens = Tokenize(test_string, '\t');