Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_5.cpp	Tue Aug 06 09:26:06 2013 +0600
+++ b/mm7_5.cpp	Tue Aug 06 09:26:17 2013 +0600
@@ -1038,7 +1038,7 @@
                         uActiveCharacter = pParty->GetNextActiveCharacter();
                         some_active_character = 0;
                         if ( pParty->bTurnBasedModeOn )
-                          pTurnEngine->_40471C();
+                          pTurnEngine->ApplyPlayerAction();
                         dword_50C9D0 = 0;
                         dword_50C9D4 = 0;
                         dword_50C9D8 = 0;
@@ -2006,7 +2006,7 @@
             v60 = sRecoveryTime;
             pParty->pTurnBasedPlayerRecoveryTimes[_506348_current_lloyd_playerid] = sRecoveryTime;
             pPlayer9->SetRecoveryTime(v60);
-            pTurnEngine->_40471C();
+            pTurnEngine->ApplyPlayerAction();
           }
           else
           {
@@ -2843,9 +2843,9 @@
           pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
           continue;
         case UIMSG_ClickAwardScrollBar:
-          dword_50651C = 1;
+          books_page_number = 1;
           if ( pMouse->GetCursorPos(&v211)->y > 178 )
-            dword_50651C = -1;
+            books_page_number = -1;
           continue;
         case UIMSG_ClickAwardsUpBtn:
           GUIWindow::Create(pBtn_Up->uX, pBtn_Up->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pBtn_Up, 0);