Mercurial > might-and-magic-trilogy

comparison mm7_3.cpp @ 36:f2686b090917

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 16 Oct 2012 09:11:08 +0600
parents be2066176d89
children 18f7a1b94448
comparison
equal deleted inserted replaced
35:7022d20db19f 36:f2686b090917
18168 LABEL_28: 18168 LABEL_28:
18169 if ( !v15 || v128 == 3 ) 18169 if ( !v15 || v128 == 3 )
18170 { 18170 {
18171 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = v128; 18171 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = v128;
18172 if ( v128 == 3 ) 18172 if ( v128 == 3 )
18173 pGameLoadingUI_ProgressBar->uType = 1; 18173 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
18174 if ( v128 == 13 ) 18174 if ( v128 == 13 )
18175 pVideoPlayer->_4BF28F(pAnimatedRooms[uCurrentHouse_Animation].field_0, 1u); 18175 pVideoPlayer->_4BF28F(pAnimatedRooms[uCurrentHouse_Animation].field_0, 1u);
18176 } 18176 }
18177 if (pAsyncMouse) 18177 if (pAsyncMouse)
18178 pAsyncMouse->Resume(); 18178 pAsyncMouse->Resume();
18995 v97 = v96 + ((v10->f[26] + ((v10->f[27] + (v10->f[28] << 8)) << 8)) << 8); 18995 v97 = v96 + ((v10->f[26] + ((v10->f[27] + (v10->f[28] << 8)) << 8)) << 8);
18996 v134 = v96 + ((v10->f[26] + ((v10->f[27] + (v10->f[28] << 8)) << 8)) << 8); 18996 v134 = v96 + ((v10->f[26] + ((v10->f[27] + (v10->f[28] << 8)) << 8)) << 8);
18997 if ( v10->f[29] || v10->f[30] ) 18997 if ( v10->f[29] || v10->f[30] )
18998 { 18998 {
18999 if ( pRenderer->pRenderD3D && !pRenderer->bWindowMode ) 18999 if ( pRenderer->pRenderD3D && !pRenderer->bWindowMode )
19000 pRenderer->_49FD3A(v9); 19000 pRenderer->_49FD3A();
19001 sub_444839_move_map( 19001 sub_444839_move_map(
19002 (unsigned __int8)pSomeEVT[v9 + 29], 19002 (unsigned __int8)pSomeEVT[v9 + 29],
19003 (unsigned __int8)pSomeEVT[v9 + 30], 19003 (unsigned __int8)pSomeEVT[v9 + 30],
19004 v135, 19004 v135,
19005 v132, 19005 v132,
19060 pAudioPlayer->PlaySound((SoundID)v106, v107, v108, v109, v110, v111, v116, v120); 19060 pAudioPlayer->PlaySound((SoundID)v106, v107, v108, v109, v110, v111, v116, v120);
19061 } 19061 }
19062 } 19062 }
19063 else 19063 else
19064 { 19064 {
19065 pGameLoadingUI_ProgressBar->uType = (_5C3420_pDecoration == 0) + 1; 19065 pGameLoadingUI_ProgressBar->uType = (GUIProgressBar::Type)((_5C3420_pDecoration == 0) + 1);
19066 sub_44987B(v99, 0); 19066 sub_44987B(v99, 0);
19067 v133 = 1; 19067 v133 = 1;
19068 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 13 ) 19068 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 13 )
19069 { 19069 {
19070 if ( uGameState == 2 ) 19070 if ( uGameState == 2 )
19113 case EVENT_SpeakInHouse: 19113 case EVENT_SpeakInHouse:
19114 v103 = v10->f[5] + ((v10->f[6] + ((v10->f[7] + (v10->f[8] << 8)) << 8)) << 8); 19114 v103 = v10->f[5] + ((v10->f[6] + ((v10->f[7] + (v10->f[8] << 8)) << 8)) << 8);
19115 if ( EnterHouse((enum HOUSE_TYPE)(v10->f[5] + ((v10->f[6] + ((v10->f[7] + (v10->f[8] << 8)) << 8)) << 8))) ) 19115 if ( EnterHouse((enum HOUSE_TYPE)(v10->f[5] + ((v10->f[6] + ((v10->f[7] + (v10->f[8] << 8)) << 8)) << 8))) )
19116 { 19116 {
19117 if ( pRenderer->pRenderD3D && !pRenderer->bWindowMode ) 19117 if ( pRenderer->pRenderD3D && !pRenderer->bWindowMode )
19118 pRenderer->_49FD3A(v103); 19118 pRenderer->_49FD3A();
19119 pAudioPlayer->PlaySound((SoundID)0, 0, 0, -1, 0, 0, 0, 0); 19119 pAudioPlayer->PlaySound((SoundID)0, 0, 0, -1, 0, 0, 0, 0);
19120 pAudioPlayer->PlaySound(SOUND_EnteringAHouse, 814, 0, -1, 0, 0, 0, 0); 19120 pAudioPlayer->PlaySound(SOUND_EnteringAHouse, 814, 0, -1, 0, 0, 0, 0);
19121 v104 = 187; 19121 v104 = 187;
19122 if ( uCurrentHouse_Animation != 167 ) 19122 if ( uCurrentHouse_Animation != 167 )
19123 v104 = v103; 19123 v104 = v103;
20268 char *result; // eax@3 20268 char *result; // eax@3
20269 20269
20270 v2 = pMapName; 20270 v2 = pMapName;
20271 v3 = uStartingPointType; 20271 v3 = uStartingPointType;
20272 pAudioPlayer->StopChannels(-1, -1); 20272 pAudioPlayer->StopChannels(-1, -1);
20273 pGameLoadingUI_ProgressBar->_443484(0); 20273 pGameLoadingUI_ProgressBar->_443484((GUIProgressBar::Type)0);
20274 if ( _strcmpi(pCurrentMapName, v2) ) 20274 if ( _strcmpi(pCurrentMapName, v2) )
20275 SaveGame(1, 0); 20275 SaveGame(1, 0);
20276 uGameState = 2; 20276 uGameState = 2;
20277 result = strcpy(pCurrentMapName, v2); 20277 result = strcpy(pCurrentMapName, v2);
20278 uLevel_StartingPointType = v3; 20278 uLevel_StartingPointType = v3;
20578 _5B65B0_npcdata_rep_or_other = 0; 20578 _5B65B0_npcdata_rep_or_other = 0;
20579 _5B65B4_npcdata_loword_house_or_other = 0; 20579 _5B65B4_npcdata_loword_house_or_other = 0;
20580 _5B65B8_npcdata_hiword_house_or_other = 0; 20580 _5B65B8_npcdata_hiword_house_or_other = 0;
20581 dword_5B65BC = 0; 20581 dword_5B65BC = 0;
20582 dword_5B65C0 = 0; 20582 dword_5B65C0 = 0;
20583 pGameLoadingUI_ProgressBar->uType = 1; 20583 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
20584 sub_44987B("nwc.blv", 0); 20584 sub_44987B("nwc.blv", 0);
20585 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0; 20585 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0;
20586 result = 1; 20586 result = 1;
20587 } 20587 }
20588 return result; 20588 return result;
20589 } 20589 }
20590 // 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; 20590
20591 // 5B65A8: using guessed type int _5B65A8_npcdata_uflags_or_other;
20592 // 5B65AC: using guessed type int _5B65AC_npcdata_fame_or_other;
20593 // 5B65B0: using guessed type int _5B65B0_npcdata_rep_or_other;
20594 // 5B65B4: using guessed type int _5B65B4_npcdata_loword_house_or_other;
20595 // 5B65B8: using guessed type int _5B65B8_npcdata_hiword_house_or_other;
20596 // 5B65BC: using guessed type int dword_5B65BC;
20597 // 5B65C0: using guessed type int dword_5B65C0;
20598 20591
20599 //----- (0044C2F4) -------------------------------------------------------- 20592 //----- (0044C2F4) --------------------------------------------------------
20600 int LevelDecoration::IsInteractive() 20593 int LevelDecoration::IsInteractive()
20601 { 20594 {
20602 signed int v1; // eax@1 20595 signed int v1; // eax@1