Mercurial > mm7

comparison Actor.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 d6cf8ead9242
children 27b7ee003c7c
comparison
equal deleted inserted replaced
1369:6b4a1c44a56f 1448:5a5d0c713d47
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
4156 } 4156 }
4157 } 4157 }
4158 4158
4159 if (pParty->bTurnBasedModeOn) 4159 if (pParty->bTurnBasedModeOn)
4160 { 4160 {
4161 pTurnEngine->_405E14(); 4161 pTurnEngine->AITurnBasedAction();
4162 return; 4162 return;
4163 } 4163 }
4164 4164
4165 4165
4166 //uActorID = v0; 4166 //uActorID = v0;