Mercurial > mm7
diff Game.cpp @ 1832:f3b106aff057
Merge
author | Ritor1 |
---|---|
date | Mon, 07 Oct 2013 21:57:01 +0600 |
parents | 633f81bb3ae7 |
children | bdac32c645c5 |
line wrap: on
line diff
--- a/Game.cpp Mon Oct 07 21:56:47 2013 +0600 +++ b/Game.cpp Mon Oct 07 21:57:01 2013 +0600 @@ -355,22 +355,8 @@ pRenderer->Present(); continue; } - if ( pVideoPlayer->pSmackerMovie && !SmackWait(pVideoPlayer->pSmackerMovie) ) - { - pRenderer->BeginScene(); - pMouse->DrawCursorToTarget(); - pVideoPlayer->SmackUpdatePalette(pVideoPlayer->hWindow); - pMouse->_469EA4(); - pRenderer->EndScene(); - } - else if ( pVideoPlayer->pBinkMovie && !BinkWait(pVideoPlayer->pBinkMovie) ) - { - pRenderer->BeginScene(); - pMouse->DrawCursorToTarget(); - pVideoPlayer->BinkUpdatePalette(pVideoPlayer->hWindow); - pMouse->_469EA4(); - pRenderer->EndScene(); - } + + pVideoPlayer->_inlined_in_463149(); pEventTimer->Update(); pMiscTimer->Update(); @@ -755,11 +741,11 @@ WriteWindowsRegistryInt("startinwindow", pRenderer->bWindowMode); - if ( GetWindowRect(hWnd, &Rect) && pRenderer->bWindowMode ) + /*if ( GetWindowRect(hWnd, &Rect) && pRenderer->bWindowMode ) { WriteWindowsRegistryInt("window X", Rect.left); WriteWindowsRegistryInt("window Y", Rect.top); - } + }*/ WriteWindowsRegistryInt("valAlwaysRun", bAlwaysRun); pItemsTable->Release(); pNPCStats->Release(); @@ -946,7 +932,7 @@ //pThreadWardInstance = new ThreadWard; pThreadWardInstance = nullptr; pParticleEngine = new ParticleEngine; - pMouse = pMouseInstance = new Mouse(pThreadWardInstance); + pMouse = pMouseInstance = new Mouse; pLightmapBuilder = new LightmapBuilder; pVisInstance = new Vis; pStru6Instance = new stru6;