Mercurial > mm7

comparison Events.cpp @ 770:02bfc82f429c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sat, 23 Mar 2013 09:26:07 +0600
parents 585490c29945
children cf2fbac6edc9 b1b991f67d40
comparison
equal deleted inserted replaced
769:2f40f4b35ce0 770:02bfc82f429c
1351 if ( pCurrentScreen == SCREEN_HOUSE ) 1351 if ( pCurrentScreen == SCREEN_HOUSE )
1352 { 1352 {
1353 if ( uGameState == 2 ) 1353 if ( uGameState == 2 )
1354 { 1354 {
1355 pAudioPlayer->StopChannels(-1, -1); 1355 pAudioPlayer->StopChannels(-1, -1);
1356 dialog_menu_id = 0; 1356 dialog_menu_id = HOUSE_DIALOGUE_NULL;
1357 while ( sub_4BD8B5() ) 1357 while ( sub_4BD8B5() )
1358 ; 1358 ;
1359 pVideoPlayer->Unload(); 1359 pVideoPlayer->Unload();
1360 window_SpeakInHouse->Release(); 1360 window_SpeakInHouse->Release();
1361 window_SpeakInHouse = 0; 1361 window_SpeakInHouse = 0;
1363 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 1363 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
1364 pCurrentScreen = SCREEN_GAME; 1364 pCurrentScreen = SCREEN_GAME;
1365 viewparams->bRedrawGameUI = 1; 1365 viewparams->bRedrawGameUI = 1;
1366 pDialogueNPCCount = 0; 1366 pDialogueNPCCount = 0;
1367 pDialogueWindow->Release(); 1367 pDialogueWindow->Release();
1368 dialog_menu_id = 0; 1368 dialog_menu_id = HOUSE_DIALOGUE_NULL;
1369 pDialogueWindow = 0; 1369 pDialogueWindow = 0;
1370 pIcons_LOD->_40F9C5(); 1370 pIcons_LOD->_40F9C5();
1371 } 1371 }
1372 goto LABEL_302; 1372 goto LABEL_302;
1373 } 1373 }