Mercurial > mm7

diff Game.cpp @ 2331:9551756f46c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
author Grumpy7
date Wed, 02 Apr 2014 01:21:05 +0200
parents d65414f65bd4
children ddb803517a48
line wrap: on
line diff
--- a/Game.cpp	Tue Apr 01 23:44:27 2014 +0200
+++ b/Game.cpp	Wed Apr 02 01:21:05 2014 +0200
@@ -333,7 +333,7 @@
       }
       pGame->_44EEA7();
       GameUI_WritePointedObjectStatusString();
-      ProcessInputActions();
+      Keyboard::ProcessInputActions();
       GameUI_MsgProc();
       if ( pArcomageGame->bGameInProgress )
       {
@@ -3441,13 +3441,13 @@
             continue;
           if ( pParty->bTurnBasedModeOn != 1 )
           {
-            _42ECB5_PlayerAttacksActor();
+            Player::_42ECB5_PlayerAttacksActor();
             continue;
           }
           if ( pTurnEngine->turn_stage == TE_WAIT || pTurnEngine->turn_stage == TE_MOVEMENT )
             continue;
           if ( !(pTurnEngine->field_18 & TE_HAVE_PENDING_ACTIONS) )
-            _42ECB5_PlayerAttacksActor();
+            Player::_42ECB5_PlayerAttacksActor();
           continue;
         case UIMSG_ExitRest:
           GUIWindow::Create(pButton_RestUI_Exit->uX, pButton_RestUI_Exit->uY, 0, 0, WINDOW_CloseRestWindowBtn, (int)pButton_RestUI_Exit, pGlobalTXT_LocalizationStrings[81]);// "Exit Rest"
@@ -4560,4 +4560,22 @@
     }
     while ( pMessageQueue_50CBD0->uNumMessages );
   }
+}
+
+
+
+//----- (0042FBDD) --------------------------------------------------------
+void  sub_42FBDD()
+{
+  pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
+  pRenderer->DrawTextureTransparent(pBtn_YES->uX, pBtn_YES->uY, pBtn_YES->pTextures[0]);
+  pRenderer->Present();
+}
+
+//----- (0042FC15) --------------------------------------------------------
+void  CloseWindowBackground()
+{
+  pAudioPlayer->PlaySound(SOUND_Button2, -2, 0, -1, 0, 0, 0, 0);
+  pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pBtn_ExitCancel->pTextures[0]);
+  pRenderer->Present();
 }
\ No newline at end of file