Mercurial > might-and-magic-trilogy

comparison mm7_2.cpp @ 6:82f81d5b7221

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Серик@ПончиК
date Tue, 09 Oct 2012 20:00:24 +0600
parents ac0fb48cd27a
children 2ca04ccb612a
comparison
equal deleted inserted replaced
5:ca90d9e499b3 6:82f81d5b7221
13095 { 13095 {
13096 v12 = 0; 13096 v12 = 0;
13097 do 13097 do
13098 { 13098 {
13099 if ( pIndoor->pFaces[v12].uBitmapID != -1 ) 13099 if ( pIndoor->pFaces[v12].uBitmapID != -1 )
13100 HIWORD(pBitmaps_LOD->pTextures[pIndoor->pFaces[v12].uBitmapID].palette) = pPaletteManager->LoadPalette(pBitmaps_LOD->pTextures[pIndoor->pFaces[v12].uBitmapID].palette); 13100 pBitmaps_LOD->pTextures[pIndoor->pFaces[v12].uBitmapID].palette_id2 = pPaletteManager->LoadPalette(pBitmaps_LOD->pTextures[pIndoor->pFaces[v12].uBitmapID].palette_id1);
13101 ++i; 13101 ++i;
13102 ++v12; 13102 ++v12;
13103 } 13103 }
13104 while ( i < (signed int)pIndoor->uNumFaces ); 13104 while ( i < (signed int)pIndoor->uNumFaces );
13105 } 13105 }
13861 13861
13862 13862
13863 13863
13864 13864
13865 //----- (004637EB) -------------------------------------------------------- 13865 //----- (004637EB) --------------------------------------------------------
13866 signed int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam) 13866 int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam)
13867 { 13867 {
13868 unsigned int v4; // esi@1 13868 unsigned int v4; // esi@1
13869 Render *v5; // ecx@14 13869 Render *v5; // ecx@14
13870 HANDLE v6; // eax@32 13870 HANDLE v6; // eax@32
13871 Keyboard *v7; // eax@33 13871 Keyboard *v7; // eax@33
14078 } 14078 }
14079 if ( Msg > WM_ACTIVATEAPP ) 14079 if ( Msg > WM_ACTIVATEAPP )
14080 { 14080 {
14081 if ( Msg == WM_WINDOWPOSCHANGED ) 14081 if ( Msg == WM_WINDOWPOSCHANGED )
14082 { 14082 {
14083 if ( pVideoPlayer->AnyMovieLoaded() && pVideoPlayer->pBinkBuffer ) 14083 if (pVideoPlayer)
14084 { 14084 {
14085 BinkBufferSetOffset(pVideoPlayer->pBinkBuffer, 0, 0); 14085 if (pVideoPlayer->AnyMovieLoaded() && pVideoPlayer->pBinkBuffer)
14086 return DefWindowProcA(hWnd, Msg, wParam, v4); 14086 {
14087 BinkBufferSetOffset(pVideoPlayer->pBinkBuffer, 0, 0);
14088 return DefWindowProcA(hWnd, Msg, wParam, v4);
14089 }
14087 } 14090 }
14088 goto _def_wnd_proc; 14091 goto _def_wnd_proc;
14089 } 14092 }
14090 if ( Msg != WM_KEYFIRST ) 14093 if ( Msg != WM_KEYFIRST )
14091 { 14094 {
15426 pAudioPlayer->Initialize(hWnd); 15429 pAudioPlayer->Initialize(hWnd);
15427 15430
15428 pVideoPlayer = new VideoPlayer; 15431 pVideoPlayer = new VideoPlayer;
15429 pVideoPlayer->Initialize(); 15432 pVideoPlayer->Initialize();
15430 15433
15431 BYTE1(dword_6BE364_game_settings_1) |= 0x40u; 15434 dword_6BE364_game_settings_1 |= 0x4000;
15432 15435
15433 if ( uTurnSpeed ) 15436 if ( uTurnSpeed )
15434 { 15437 {
15435 switch ( uTurnSpeed ) 15438 switch ( uTurnSpeed )
15436 { 15439 {
15447 } 15450 }
15448 else 15451 else
15449 { 15452 {
15450 uTurnSpeed = (unsigned int)uCPUSpeed < 0xC7 ? 128 : 64; 15453 uTurnSpeed = (unsigned int)uCPUSpeed < 0xC7 ? 128 : 64;
15451 } 15454 }
15452 return 1; 15455 return true;
15453 } 15456 }
15454 15457
15455 15458
15456 15459
15457 15460
15465 __int16 v4; // ax@4 15468 __int16 v4; // ax@4
15466 signed int v5; // esi@5 15469 signed int v5; // esi@5
15467 int v6; // ecx@6 15470 int v6; // ecx@6
15468 int v7; // edx@7 15471 int v7; // edx@7
15469 ObjectDesc *v8; // eax@7 15472 ObjectDesc *v8; // eax@7
15470 signed int v9; // esi@8 15473 //signed int v9; // esi@8
15471 signed int v10; // ebx@14 15474 signed int v10; // ebx@14
15472 signed int v11; // esi@15 15475 signed int v11; // esi@15
15473 char pContainer[32]; // [sp+10h] [bp-Ch]@9 15476 char pContainer[32]; // [sp+10h] [bp-Ch]@9
15474 15477
15475 pMouse->Initialize(hWnd); 15478 pMouse->Initialize(hWnd);
15535 while ( v5 < (signed int)pObjectList->uNumObjects ); 15538 while ( v5 < (signed int)pObjectList->uNumObjects );
15536 } 15539 }
15537 flt_6BE3A0 = 0.55000001f; 15540 flt_6BE3A0 = 0.55000001f;
15538 MainMenuUI_Create(); 15541 MainMenuUI_Create();
15539 pGame->pStru6Instance->LoadAnimations(); 15542 pGame->pStru6Instance->LoadAnimations();
15540 v9 = 0; 15543
15541 do 15544 for (uint i = 0; i < 7; ++i)
15542 { 15545 {
15543 sprintf(pContainer, "HDWTR%03u", v9); 15546 sprintf(pContainer, "HDWTR%03u", i);
15544 pRenderer->pHDWaterBitmapIDs[v9++] = pBitmaps_LOD->LoadTexture(pContainer); 15547 pRenderer->pHDWaterBitmapIDs[i] = pBitmaps_LOD->LoadTexture(pContainer);
15545 } 15548 }
15546 while ( v9 < 7 );
15547 15549
15548 pNPCStats = new NPCStats; 15550 pNPCStats = new NPCStats;
15549 pNPCStats->Initialize(); 15551 pNPCStats->Initialize();
15550 15552
15551 Initialize_GlobalEVT(); 15553 Initialize_GlobalEVT();