Mercurial > mm7

changeset 2480:24fd08aef81e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 22 Aug 2014 11:07:07 +0600
parents 908baf8e7d23 (current diff) e54f5bfe8f1a (diff)
children 4f4eb812af28
files
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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 )
--- 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');