Mercurial > mm7

comparison Actor.cpp @ 1452:9add223260ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 06 Aug 2013 09:26:17 +0600
parents 27b7ee003c7c
children 8ff3c675a726
comparison
equal deleted inserted replaced
1451:6b1c8c41c83f 1452:9add223260ce
2320 v8 = pPlayer->GetAttackRecoveryTime(0); 2320 v8 = pPlayer->GetAttackRecoveryTime(0);
2321 if ( v8 < 30 ) 2321 if ( v8 < 30 )
2322 v8 = 30; 2322 v8 = 30;
2323 if ( !pParty->bTurnBasedModeOn ) 2323 if ( !pParty->bTurnBasedModeOn )
2324 pPlayer->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)v8 * 2.133333333333333)); 2324 pPlayer->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)v8 * 2.133333333333333));
2325 pTurnEngine->_40471C(); 2325 pTurnEngine->ApplyPlayerAction();
2326 result = 1; 2326 result = 1;
2327 } 2327 }
2328 return result; 2328 return result;
2329 } 2329 }
2330 2330
4154 } 4154 }
4155 } 4155 }
4156 4156
4157 if (pParty->bTurnBasedModeOn) 4157 if (pParty->bTurnBasedModeOn)
4158 { 4158 {
4159 pTurnEngine->_405E14(); 4159 pTurnEngine->AITurnBasedAction();
4160 return; 4160 return;
4161 } 4161 }
4162 4162
4163 4163
4164 //uActorID = v0; 4164 //uActorID = v0;