Mercurial > mm7

comparison mm7_5.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 b3ac17fd12de
children 27b7ee003c7c
comparison
equal deleted inserted replaced
1369:6b4a1c44a56f 1448:5a5d0c713d47
1037 { 1037 {
1038 uActiveCharacter = some_active_character; 1038 uActiveCharacter = some_active_character;
1039 uActiveCharacter = pParty->GetNextActiveCharacter(); 1039 uActiveCharacter = pParty->GetNextActiveCharacter();
1040 some_active_character = 0; 1040 some_active_character = 0;
1041 if ( pParty->bTurnBasedModeOn ) 1041 if ( pParty->bTurnBasedModeOn )
1042 pTurnEngine->_40471C(); 1042 pTurnEngine->ApplyPlayerAction();
1043 dword_50C9D0 = 0; 1043 dword_50C9D0 = 0;
1044 dword_50C9D4 = 0; 1044 dword_50C9D4 = 0;
1045 dword_50C9D8 = 0; 1045 dword_50C9D8 = 0;
1046 } 1046 }
1047 if ( ptr_50C9A4 && ptr_50C9A4->uItemID ) 1047 if ( ptr_50C9A4 && ptr_50C9A4->uItemID )
2007 if ( pParty->bTurnBasedModeOn ) 2007 if ( pParty->bTurnBasedModeOn )
2008 { 2008 {
2009 v60 = sRecoveryTime; 2009 v60 = sRecoveryTime;
2010 pParty->pTurnBasedPlayerRecoveryTimes[_506348_current_lloyd_playerid] = sRecoveryTime; 2010 pParty->pTurnBasedPlayerRecoveryTimes[_506348_current_lloyd_playerid] = sRecoveryTime;
2011 pPlayer9->SetRecoveryTime(v60); 2011 pPlayer9->SetRecoveryTime(v60);
2012 pTurnEngine->_40471C(); 2012 pTurnEngine->ApplyPlayerAction();
2013 } 2013 }
2014 else 2014 else
2015 { 2015 {
2016 pPlayer9->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)sRecoveryTime * 2.133333333333333)); 2016 pPlayer9->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)sRecoveryTime * 2.133333333333333));
2017 } 2017 }