Mercurial > mm7

comparison mm7_5.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
1036 { 1036 {
1037 uActiveCharacter = some_active_character; 1037 uActiveCharacter = some_active_character;
1038 uActiveCharacter = pParty->GetNextActiveCharacter(); 1038 uActiveCharacter = pParty->GetNextActiveCharacter();
1039 some_active_character = 0; 1039 some_active_character = 0;
1040 if ( pParty->bTurnBasedModeOn ) 1040 if ( pParty->bTurnBasedModeOn )
1041 pTurnEngine->_40471C(); 1041 pTurnEngine->ApplyPlayerAction();
1042 dword_50C9D0 = 0; 1042 dword_50C9D0 = 0;
1043 dword_50C9D4 = 0; 1043 dword_50C9D4 = 0;
1044 dword_50C9D8 = 0; 1044 dword_50C9D8 = 0;
1045 } 1045 }
1046 if ( ptr_50C9A4 && ptr_50C9A4->uItemID ) 1046 if ( ptr_50C9A4 && ptr_50C9A4->uItemID )
2004 if ( pParty->bTurnBasedModeOn ) 2004 if ( pParty->bTurnBasedModeOn )
2005 { 2005 {
2006 v60 = sRecoveryTime; 2006 v60 = sRecoveryTime;
2007 pParty->pTurnBasedPlayerRecoveryTimes[_506348_current_lloyd_playerid] = sRecoveryTime; 2007 pParty->pTurnBasedPlayerRecoveryTimes[_506348_current_lloyd_playerid] = sRecoveryTime;
2008 pPlayer9->SetRecoveryTime(v60); 2008 pPlayer9->SetRecoveryTime(v60);
2009 pTurnEngine->_40471C(); 2009 pTurnEngine->ApplyPlayerAction();
2010 } 2010 }
2011 else 2011 else
2012 { 2012 {
2013 pPlayer9->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)sRecoveryTime * 2.133333333333333)); 2013 pPlayer9->SetRecoveryTime((signed __int64)(flt_6BE3A4_debug_recmod1 * (double)sRecoveryTime * 2.133333333333333));
2014 } 2014 }
2841 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 2841 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
2842 ++pMessageQueue_50CBD0->uNumMessages;*/ 2842 ++pMessageQueue_50CBD0->uNumMessages;*/
2843 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 2843 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
2844 continue; 2844 continue;
2845 case UIMSG_ClickAwardScrollBar: 2845 case UIMSG_ClickAwardScrollBar:
2846 dword_50651C = 1; 2846 books_page_number = 1;
2847 if ( pMouse->GetCursorPos(&v211)->y > 178 ) 2847 if ( pMouse->GetCursorPos(&v211)->y > 178 )
2848 dword_50651C = -1; 2848 books_page_number = -1;
2849 continue; 2849 continue;
2850 case UIMSG_ClickAwardsUpBtn: 2850 case UIMSG_ClickAwardsUpBtn:
2851 GUIWindow::Create(pBtn_Up->uX, pBtn_Up->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pBtn_Up, 0); 2851 GUIWindow::Create(pBtn_Up->uX, pBtn_Up->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pBtn_Up, 0);
2852 BtnUp_flag = 1; 2852 BtnUp_flag = 1;
2853 continue; 2853 continue;