Mercurial > might-and-magic-trilogy
diff mm7_3.cpp @ 27:be2066176d89
On level initialization
author | Nomad |
---|---|
date | Tue, 16 Oct 2012 01:31:05 +0200 |
parents | 93bf1d5f6a6d |
children | 18f7a1b94448 |
line wrap: on
line diff
--- a/mm7_3.cpp Tue Oct 16 00:05:53 2012 +0200 +++ b/mm7_3.cpp Tue Oct 16 01:31:05 2012 +0200 @@ -18170,7 +18170,7 @@ { uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = v128; if ( v128 == 3 ) - pGameLoadingUI_ProgressBar->uType = 1; + pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen; if ( v128 == 13 ) pVideoPlayer->_4BF28F(pAnimatedRooms[uCurrentHouse_Animation].field_0, 1u); } @@ -18997,7 +18997,7 @@ if ( v10->f[29] || v10->f[30] ) { if ( pRenderer->pRenderD3D && !pRenderer->bWindowMode ) - pRenderer->_49FD3A(v9); + pRenderer->_49FD3A(); sub_444839_move_map( (unsigned __int8)pSomeEVT[v9 + 29], (unsigned __int8)pSomeEVT[v9 + 30], @@ -19062,7 +19062,7 @@ } else { - pGameLoadingUI_ProgressBar->uType = (_5C3420_pDecoration == 0) + 1; + pGameLoadingUI_ProgressBar->uType = (GUIProgressBar::Type)((_5C3420_pDecoration == 0) + 1); sub_44987B(v99, 0); v133 = 1; if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 13 ) @@ -19115,7 +19115,7 @@ if ( EnterHouse((enum HOUSE_TYPE)(v10->f[5] + ((v10->f[6] + ((v10->f[7] + (v10->f[8] << 8)) << 8)) << 8))) ) { if ( pRenderer->pRenderD3D && !pRenderer->bWindowMode ) - pRenderer->_49FD3A(v103); + pRenderer->_49FD3A(); pAudioPlayer->PlaySound((SoundID)0, 0, 0, -1, 0, 0, 0, 0); pAudioPlayer->PlaySound(SOUND_EnteringAHouse, 814, 0, -1, 0, 0, 0, 0); v104 = 187; @@ -20270,7 +20270,7 @@ v2 = pMapName; v3 = uStartingPointType; pAudioPlayer->StopChannels(-1, -1); - pGameLoadingUI_ProgressBar->_443484(0); + pGameLoadingUI_ProgressBar->_443484((GUIProgressBar::Type)0); if ( _strcmpi(pCurrentMapName, v2) ) SaveGame(1, 0); uGameState = 2; @@ -20580,21 +20580,14 @@ _5B65B8_npcdata_hiword_house_or_other = 0; dword_5B65BC = 0; dword_5B65C0 = 0; - pGameLoadingUI_ProgressBar->uType = 1; + pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen; sub_44987B("nwc.blv", 0); uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0; result = 1; } return result; } -// 4E28F8: using guessed type int uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions; -// 5B65A8: using guessed type int _5B65A8_npcdata_uflags_or_other; -// 5B65AC: using guessed type int _5B65AC_npcdata_fame_or_other; -// 5B65B0: using guessed type int _5B65B0_npcdata_rep_or_other; -// 5B65B4: using guessed type int _5B65B4_npcdata_loword_house_or_other; -// 5B65B8: using guessed type int _5B65B8_npcdata_hiword_house_or_other; -// 5B65BC: using guessed type int dword_5B65BC; -// 5B65C0: using guessed type int dword_5B65C0; + //----- (0044C2F4) -------------------------------------------------------- int LevelDecoration::IsInteractive()