Mercurial > might-and-magic-trilogy
diff Game.cpp @ 27:be2066176d89
On level initialization
author | Nomad |
---|---|
date | Tue, 16 Oct 2012 01:31:05 +0200 |
parents | 93bf1d5f6a6d |
children | e62134245ab0 |
line wrap: on
line diff
--- a/Game.cpp Tue Oct 16 00:05:53 2012 +0200 +++ b/Game.cpp Tue Oct 16 01:31:05 2012 +0200 @@ -198,8 +198,8 @@ { //signed int v0; // ebp@3 //signed int v1; // esi@4 - Render *v2; // edi@7 - signed int v3; // esi@7 + //Render *v2; // edi@7 + //signed int v3; // esi@7 signed int v4; // ecx@58 char *v5; // eax@59 Player *v6; // esi@65 @@ -236,21 +236,21 @@ LoadPlayerPortraintsAndVoices(); pIcons_LOD->dword_11B84 = pIcons_LOD->uNumLoadedFiles; - pAudioPlayer->SetMusicVolume((signed __int64)(pSoundVolumeLevels[(char)uMusicVolimeMultiplier] * 64.0)); - v2 = pRenderer; - v3 = 1; + pAudioPlayer->SetMusicVolume(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0); + while ( 2 ) { - v16 = v3; - if ( pMessageQueue_50CBD0->uNumMessages ) + v16 = 1; + if (pMessageQueue_50CBD0->uNumMessages) pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; + pPartyActionQueue->uNumActions = 0; - if ( pParty->bTurnBasedModeOn == v3 ) + if (pParty->bTurnBasedModeOn) { - pTurnEngine->End(0); - pParty->bTurnBasedModeOn = 0; + pTurnEngine->End(false); + pParty->bTurnBasedModeOn = false; } - DoPrepareWorld(bLoading, v3); + DoPrepareWorld(bLoading, 1); pEventTimer->Resume(); dword_6BE364_game_settings_1 |= 0x80; dword_6BE340 = 2; @@ -264,7 +264,7 @@ bLoadinga = 0; do { - while ( PeekMessageA(&Msg, 0, 0, 0, v3) ) + while ( PeekMessageA(&Msg, 0, 0, 0, PM_REMOVE) ) { if ( Msg.message == WM_QUIT ) Game_DeinitializeAndTerminate(0); @@ -284,26 +284,26 @@ { ArcomageGame::Loop(); LABEL_89: - v2->Present(); + pRenderer->Present(); continue; } if (pAsyncMouse) - pAsyncMouse->_46B736_consume_click_lists(v3); + pAsyncMouse->_46B736_consume_click_lists(1); if ( pVideoPlayer->pSmackerMovie && !SmackWait(pVideoPlayer->pSmackerMovie) ) { - v2->BeginScene(); + pRenderer->BeginScene(); pMouse->_469E3B(); pVideoPlayer->SmackUpdatePalette(pVideoPlayer->hWindow); pMouse->_469EA4(); - v2->EndScene(); + pRenderer->EndScene(); } if ( pVideoPlayer->pBinkMovie && !BinkWait(pVideoPlayer->pBinkMovie) ) { - v2->BeginScene(); + pRenderer->BeginScene(); pMouse->_469E3B(); pVideoPlayer->BinkUpdatePalette(pVideoPlayer->hWindow); pMouse->_469EA4(); - v2->EndScene(); + pRenderer->EndScene(); } pEventTimer->Update(); pMiscTimer->Update(); @@ -330,12 +330,12 @@ if ( v16 ) { v16 = 0; - viewparams->bRedrawGameUI = v3; + viewparams->bRedrawGameUI = true; } pAudioPlayer->_4AAFCF(); - if ( uGameState == v3 ) + if (uGameState == 1) goto LABEL_96; - if ( uGameState == 2 ) + if (uGameState == 2) { pAudioPlayer->StopChannels(-1, -1); PrepareWorld(0); @@ -347,7 +347,7 @@ if ( (signed int)uGameState <= 5 || uGameState == 7 ) { LABEL_96: - bLoadinga = v3; + bLoadinga = 1; continue; } if ( uGameState != 8 ) @@ -470,7 +470,6 @@ } ShowStatusBarString(pGlobalTXT_LocalizationStrings[524], 2u);// "Once again you've cheated death!.." uGameState = 0; - v3 = 1; } while ( !bLoadinga ); dword_6BE340 = 0; @@ -482,7 +481,7 @@ LoadPlayerPortraintsAndVoices(); uGameState = 0; pIcons_LOD->dword_11B84 = pIcons_LOD->uNumLoadedFiles; - bLoading = v3; + bLoading = true; continue; } break;