Mercurial > mm7

comparison Game.cpp @ 1832:f3b106aff057

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Mon, 07 Oct 2013 21:57:01 +0600
parents 633f81bb3ae7
children bdac32c645c5
comparison
equal deleted inserted replaced
1831:d7791af42deb 1832:f3b106aff057
353 { 353 {
354 ArcomageGame::Loop(); 354 ArcomageGame::Loop();
355 pRenderer->Present(); 355 pRenderer->Present();
356 continue; 356 continue;
357 } 357 }
358 if ( pVideoPlayer->pSmackerMovie && !SmackWait(pVideoPlayer->pSmackerMovie) ) 358
359 { 359 pVideoPlayer->_inlined_in_463149();
360 pRenderer->BeginScene();
361 pMouse->DrawCursorToTarget();
362 pVideoPlayer->SmackUpdatePalette(pVideoPlayer->hWindow);
363 pMouse->_469EA4();
364 pRenderer->EndScene();
365 }
366 else if ( pVideoPlayer->pBinkMovie && !BinkWait(pVideoPlayer->pBinkMovie) )
367 {
368 pRenderer->BeginScene();
369 pMouse->DrawCursorToTarget();
370 pVideoPlayer->BinkUpdatePalette(pVideoPlayer->hWindow);
371 pMouse->_469EA4();
372 pRenderer->EndScene();
373 }
374 360
375 pEventTimer->Update(); 361 pEventTimer->Update();
376 pMiscTimer->Update(); 362 pMiscTimer->Update();
377 363
378 OnTimer(0); 364 OnTimer(0);
753 { 739 {
754 struct tagRECT Rect; // [sp+0h] [bp-10h]@6 740 struct tagRECT Rect; // [sp+0h] [bp-10h]@6
755 741
756 742
757 WriteWindowsRegistryInt("startinwindow", pRenderer->bWindowMode); 743 WriteWindowsRegistryInt("startinwindow", pRenderer->bWindowMode);
758 if ( GetWindowRect(hWnd, &Rect) && pRenderer->bWindowMode ) 744 /*if ( GetWindowRect(hWnd, &Rect) && pRenderer->bWindowMode )
759 { 745 {
760 WriteWindowsRegistryInt("window X", Rect.left); 746 WriteWindowsRegistryInt("window X", Rect.left);
761 WriteWindowsRegistryInt("window Y", Rect.top); 747 WriteWindowsRegistryInt("window Y", Rect.top);
762 } 748 }*/
763 WriteWindowsRegistryInt("valAlwaysRun", bAlwaysRun); 749 WriteWindowsRegistryInt("valAlwaysRun", bAlwaysRun);
764 pItemsTable->Release(); 750 pItemsTable->Release();
765 pNPCStats->Release(); 751 pNPCStats->Release();
766 752
767 if (pMouse) 753 if (pMouse)
944 uSomeGammaDeltaTime = 0; 930 uSomeGammaDeltaTime = 0;
945 931
946 //pThreadWardInstance = new ThreadWard; 932 //pThreadWardInstance = new ThreadWard;
947 pThreadWardInstance = nullptr; 933 pThreadWardInstance = nullptr;
948 pParticleEngine = new ParticleEngine; 934 pParticleEngine = new ParticleEngine;
949 pMouse = pMouseInstance = new Mouse(pThreadWardInstance); 935 pMouse = pMouseInstance = new Mouse;
950 pLightmapBuilder = new LightmapBuilder; 936 pLightmapBuilder = new LightmapBuilder;
951 pVisInstance = new Vis; 937 pVisInstance = new Vis;
952 pStru6Instance = new stru6; 938 pStru6Instance = new stru6;
953 pIndoorCameraD3D = new IndoorCameraD3D; 939 pIndoorCameraD3D = new IndoorCameraD3D;
954 pStru9Instance = new stru9; 940 pStru9Instance = new stru9;