Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
1462:f682c853200d 1463:b330df6a2183
477 pOtherOverlayList->Reset(); 477 pOtherOverlayList->Reset();
478 memset(pParty->pPartyBuffs, 0, 0x140u); 478 memset(pParty->pPartyBuffs, 0, 0x140u);
479 479
480 if ( pParty->bTurnBasedModeOn == 1 ) 480 if ( pParty->bTurnBasedModeOn == 1 )
481 { 481 {
482 pTurnEngine->End(1); 482 pTurnEngine->End(true);
483 pParty->bTurnBasedModeOn = 0; 483 pParty->bTurnBasedModeOn = 0;
484 } 484 }
485 //pHealth = &pParty->pPlayers[0].sHealth;//193C 485 //pHealth = &pParty->pPlayers[0].sHealth;//193C
486 //do 486 //do
487 for(int i=0; i<4; ++i) 487 for(int i=0; i<4; ++i)