Mercurial > mm7

diff Game.cpp @ 1463:b330df6a2183

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 11 Aug 2013 12:09:33 +0600
parents 27b7ee003c7c
children 7ef4b64f6329
line wrap: on
line diff
--- a/Game.cpp	Sun Aug 11 12:09:09 2013 +0600
+++ b/Game.cpp	Sun Aug 11 12:09:33 2013 +0600
@@ -479,7 +479,7 @@
 
       if ( pParty->bTurnBasedModeOn == 1 )
       {
-        pTurnEngine->End(1);
+        pTurnEngine->End(true);
         pParty->bTurnBasedModeOn = 0;
       }
       //pHealth = &pParty->pPlayers[0].sHealth;//193C