Mercurial > mm7

comparison Game.cpp @ 1057:37498d2cceed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 23 May 2013 21:37:22 +0600
parents 39f42990698f
children bcebd491e8fa
comparison
equal deleted inserted replaced
1056:86a7e8f9ca33 1057:37498d2cceed
317 pEventTimer->Resume(); 317 pEventTimer->Resume();
318 dword_6BE364_game_settings_1 |= 0x80; 318 dword_6BE364_game_settings_1 |= 0x80;
319 dword_6BE340 = 2; 319 dword_6BE340 = 2;
320 // uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0; 320 // uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0;
321 pCurrentScreen = SCREEN_GAME; 321 pCurrentScreen = SCREEN_GAME;
322 if (pAsyncMouse) 322
323 pAsyncMouse->Resume();
324 if (pGame->pKeyboardInstance->bUsingAsynKeyboard && pAsyncKeyboard )
325 pAsyncKeyboard->Resume();
326 if ( pRenderer->pRenderD3D ) 323 if ( pRenderer->pRenderD3D )
327 pGame->pVisInstance->_4C1A02(); 324 pGame->pVisInstance->_4C1A02();
328 325
329 bool game_finished = false; 326 bool game_finished = false;
330 do 327 do
349 { 346 {
350 ArcomageGame::Loop(); 347 ArcomageGame::Loop();
351 pRenderer->Present(); 348 pRenderer->Present();
352 continue; 349 continue;
353 } 350 }
354 if (pAsyncMouse)
355 pAsyncMouse->_46B736_consume_click_lists(1);
356 if ( pVideoPlayer->pSmackerMovie && !SmackWait(pVideoPlayer->pSmackerMovie) ) 351 if ( pVideoPlayer->pSmackerMovie && !SmackWait(pVideoPlayer->pSmackerMovie) )
357 { 352 {
358 pRenderer->BeginScene(); 353 pRenderer->BeginScene();
359 pMouse->DrawCursorToTarget(); 354 pMouse->DrawCursorToTarget();
360 pVideoPlayer->SmackUpdatePalette(pVideoPlayer->hWindow); 355 pVideoPlayer->SmackUpdatePalette(pVideoPlayer->hWindow);
758 //----- (004645FA) -------------------------------------------------------- 753 //----- (004645FA) --------------------------------------------------------
759 void Game::Deinitialize() 754 void Game::Deinitialize()
760 { 755 {
761 struct tagRECT Rect; // [sp+0h] [bp-10h]@6 756 struct tagRECT Rect; // [sp+0h] [bp-10h]@6
762 757
763 if (pAsyncMouse) 758
764 pAsyncMouse->Suspend();
765 if (pGame->pKeyboardInstance->bUsingAsynKeyboard && pAsyncKeyboard)
766 pAsyncKeyboard->Suspend();
767 WriteWindowsRegistryInt("startinwindow", pRenderer->bWindowMode); 759 WriteWindowsRegistryInt("startinwindow", pRenderer->bWindowMode);
768 if ( GetWindowRect(hWnd, &Rect) && pRenderer->bWindowMode ) 760 if ( GetWindowRect(hWnd, &Rect) && pRenderer->bWindowMode )
769 { 761 {
770 WriteWindowsRegistryInt("window X", Rect.left); 762 WriteWindowsRegistryInt("window X", Rect.left);
771 WriteWindowsRegistryInt("window Y", Rect.top); 763 WriteWindowsRegistryInt("window Y", Rect.top);
772 } 764 }
773 WriteWindowsRegistryInt("valAlwaysRun", bAlwaysRun); 765 WriteWindowsRegistryInt("valAlwaysRun", bAlwaysRun);
774 pItemsTable->Release(); 766 pItemsTable->Release();
775 pNPCStats->Release(); 767 pNPCStats->Release();
776 if (pAsyncKeyboard) 768
777 pAsyncKeyboard->Release();
778 if (pAsyncMouse)
779 pAsyncMouse->Release();
780 if (pMouse) 769 if (pMouse)
781 pMouse->Deactivate(); 770 pMouse->Deactivate();
782 771
783 pAudioPlayer->Release();//error 772 pAudioPlayer->Release();//error
784 pNew_LOD->FreeSubIndexAndIO(); 773 pNew_LOD->FreeSubIndexAndIO();