Mercurial > mm7

comparison Player.cpp @ 1448:5a5d0c713d47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some turn engine renaming
author Gloval
date Tue, 06 Aug 2013 00:52:46 +0400
parents 8f339c3bbdaf
children 27b7ee003c7c
comparison
equal deleted inserted replaced
1369:6b4a1c44a56f 1448:5a5d0c713d47
6058 { 6058 {
6059 if ( pParty->bTurnBasedModeOn ) 6059 if ( pParty->bTurnBasedModeOn )
6060 { 6060 {
6061 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; 6061 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100;
6062 thisb->SetRecoveryTime(100); 6062 thisb->SetRecoveryTime(100);
6063 pTurnEngine->_40471C(); 6063 pTurnEngine->ApplyPlayerAction();
6064 } 6064 }
6065 else 6065 else
6066 { 6066 {
6067 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); 6067 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333));
6068 } 6068 }
6354 { 6354 {
6355 if ( pParty->bTurnBasedModeOn ) 6355 if ( pParty->bTurnBasedModeOn )
6356 { 6356 {
6357 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; 6357 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100;
6358 thisb->SetRecoveryTime(100); 6358 thisb->SetRecoveryTime(100);
6359 pTurnEngine->_40471C(); 6359 pTurnEngine->ApplyPlayerAction();
6360 } 6360 }
6361 else 6361 else
6362 { 6362 {
6363 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); 6363 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333));
6364 } 6364 }
6475 { 6475 {
6476 if ( pParty->bTurnBasedModeOn ) 6476 if ( pParty->bTurnBasedModeOn )
6477 { 6477 {
6478 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100; 6478 pParty->pTurnBasedPlayerRecoveryTimes[player_num-1] = 100;
6479 thisb->SetRecoveryTime(100); 6479 thisb->SetRecoveryTime(100);
6480 pTurnEngine->_40471C(); 6480 pTurnEngine->ApplyPlayerAction();
6481 } 6481 }
6482 else 6482 else
6483 { 6483 {
6484 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333)); 6484 thisb->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * 213.3333333333333));
6485 } 6485 }