Mercurial > mm7

comparison Events.cpp @ 615:8a0ec99a5177

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 08 Mar 2013 18:00:43 +0600
parents 7cb26ceb7107 cfca6297e4ae
children 610d2cf53427
comparison
equal deleted inserted replaced
614:7cb26ceb7107 615:8a0ec99a5177
1350 if ( pCurrentScreen == SCREEN_HOUSE ) 1350 if ( pCurrentScreen == SCREEN_HOUSE )
1351 { 1351 {
1352 if ( uGameState == 2 ) 1352 if ( uGameState == 2 )
1353 { 1353 {
1354 pAudioPlayer->StopChannels(-1, -1); 1354 pAudioPlayer->StopChannels(-1, -1);
1355 dword_F8B19C = 0; 1355 dialog_menu_id = 0;
1356 while ( sub_4BD8B5() ) 1356 while ( sub_4BD8B5() )
1357 ; 1357 ;
1358 pVideoPlayer->Unload(); 1358 pVideoPlayer->Unload();
1359 window_SpeakInHouse->Release(); 1359 window_SpeakInHouse->Release();
1360 window_SpeakInHouse = 0; 1360 window_SpeakInHouse = 0;
1362 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 1362 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
1363 pCurrentScreen = SCREEN_GAME; 1363 pCurrentScreen = SCREEN_GAME;
1364 viewparams->bRedrawGameUI = 1; 1364 viewparams->bRedrawGameUI = 1;
1365 pDialogueNPCCount = 0; 1365 pDialogueNPCCount = 0;
1366 pDialogueWindow->Release(); 1366 pDialogueWindow->Release();
1367 dword_F8B19C = 0; 1367 dialog_menu_id = 0;
1368 pDialogueWindow = 0; 1368 pDialogueWindow = 0;
1369 pIcons_LOD->_40F9C5(); 1369 pIcons_LOD->_40F9C5();
1370 } 1370 }
1371 goto LABEL_302; 1371 goto LABEL_302;
1372 } 1372 }