Mercurial > mm7

comparison mm7_2.cpp @ 966:99ee5e590b16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 07 May 2013 18:45:18 +0600
parents a6510526f791 5a12082c803d
children e3123a1dea82
comparison
equal deleted inserted replaced
965:a6510526f791 966:99ee5e590b16
864 { 864 {
865 //v3 = byte_591180; 865 //v3 = byte_591180;
866 do 866 do
867 { 867 {
868 HouseNPCData[v2 + 7] = (NPCData *)window_SpeakInHouse->CreateButton(pNPCPortraits_x[v1 - 1][v2], pNPCPortraits_y[v1 - 1][v2], 868 HouseNPCData[v2 + 7] = (NPCData *)window_SpeakInHouse->CreateButton(pNPCPortraits_x[v1 - 1][v2], pNPCPortraits_y[v1 - 1][v2],
869 0x3Fu, 0x49u, 1, 0, UIMSG_19A, v2, 0, byte_591180[v2], 0, 0, 0); 869 0x3Fu, 0x49u, 1, 0, UIMSG_ClickHouseNPCPortrait, v2, 0, byte_591180[v2], 0, 0, 0);
870 v1 = uNumDialogueNPCPortraits; 870 v1 = uNumDialogueNPCPortraits;
871 ++v2; 871 ++v2;
872 //v3 += 100; 872 //v3 += 100;
873 } 873 }
874 while ( (signed int)v2 < uNumDialogueNPCPortraits ); 874 while ( (signed int)v2 < uNumDialogueNPCPortraits );
6700 GUI_UpdateWindows(); 6700 GUI_UpdateWindows();
6701 if (pAsyncMouse) 6701 if (pAsyncMouse)
6702 pAsyncMouse->_46B736_consume_click_lists(1); 6702 pAsyncMouse->_46B736_consume_click_lists(1);
6703 if (GetCurrentMenuID() != MENU_MAIN) 6703 if (GetCurrentMenuID() != MENU_MAIN)
6704 { 6704 {
6705 if (GetCurrentMenuID() == MENU_LOADINGPROC) 6705 if (GetCurrentMenuID() == MENU_LoadingProcInMainMenu)
6706 { 6706 {
6707 pIcons_LOD->_4114F2(); 6707 pIcons_LOD->_4114F2();
6708 pGUIWindow_CurrentMenu->Release(); 6708 pGUIWindow_CurrentMenu->Release();
6709 pGUIWindow_CurrentMenu = 0; 6709 pGUIWindow_CurrentMenu = 0;
6710 pCurrentScreen = SCREEN_GAME; 6710 pCurrentScreen = SCREEN_GAME;
9522 AIL_redbook_stop(pAudioPlayer->hAILRedbook); 9522 AIL_redbook_stop(pAudioPlayer->hAILRedbook);
9523 extern MENU_STATE __cdecl CreditsMenu__Loop(); 9523 extern MENU_STATE __cdecl CreditsMenu__Loop();
9524 CreditsMenu__Loop(); 9524 CreditsMenu__Loop();
9525 break; 9525 break;
9526 } 9526 }
9527 if (GetCurrentMenuID() == MENU_5 || GetCurrentMenuID() == MENU_LOADINGPROC) 9527 if (GetCurrentMenuID() == MENU_5 || GetCurrentMenuID() == MENU_LoadingProcInMainMenu)
9528 { 9528 {
9529 uGameState = 0; 9529 uGameState = 0;
9530 } 9530 }
9531 else 9531 else
9532 __debugbreak(); 9532 {
9533 { 9533 if (GetCurrentMenuID() != MENU_10)
9534 /* if (GetCurrentMenuID() != MENU_10)
9535 goto LABEL_49; 9534 goto LABEL_49;
9536 pMouse->Activate(0); 9535 pMouse->Activate(0);
9537 if (pAsyncMouse) 9536 if (pAsyncMouse)
9538 pAsyncMouse->Suspend(); 9537 pAsyncMouse->Suspend();
9539 if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard ) 9538 if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard )
9555 strcpy(pCurrentMapName, ofn.lpstrFileTitle); 9554 strcpy(pCurrentMapName, ofn.lpstrFileTitle);
9556 pMouse->Activate(1); 9555 pMouse->Activate(1);
9557 if (pAsyncMouse) 9556 if (pAsyncMouse)
9558 pAsyncMouse->Resume(); 9557 pAsyncMouse->Resume();
9559 if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard ) 9558 if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard )
9560 pAsyncKeyboard->Resume();*/ 9559 pAsyncKeyboard->Resume();
9561 } 9560 }
9562 //LABEL_48: 9561 //LABEL_48:
9563 pGame->Loop(); 9562 pGame->Loop();
9564 LABEL_49: 9563 LABEL_49:
9565 if ( uGameState == 3 ) 9564 if ( uGameState == 3 )
9566 __debugbreak(); 9565 {
9567 /*{
9568 v12 = 5; 9566 v12 = 5;
9569 SetCurrentMenuID((MENU_STATE)v12); 9567 SetCurrentMenuID((MENU_STATE)v12);
9570 //goto LABEL_21; 9568 //goto LABEL_21;
9571 uGameState = 0; 9569 uGameState = 0;
9572 continue; 9570 continue;
9573 }*/ 9571 }
9574 if ( uGameState == GAME_STATE_NEWGAME_OUT_GAMEMENU ) 9572 if ( uGameState == GAME_STATE_NEWGAME_OUT_GAMEMENU )
9575 { 9573 {
9576 SetCurrentMenuID(MENU_NEWGAME); 9574 SetCurrentMenuID(MENU_NEWGAME);
9577 uGameState = 0; 9575 uGameState = 0;
9578 continue; 9576 continue;
9866 case MENU_FINISHED: return L"MENU_FINISHED"; 9864 case MENU_FINISHED: return L"MENU_FINISHED";
9867 case MENU_5: return L"MENU_5"; 9865 case MENU_5: return L"MENU_5";
9868 case MENU_CREATEPARTY: return L"MENU_CREATEPARTY"; 9866 case MENU_CREATEPARTY: return L"MENU_CREATEPARTY";
9869 case MENU_NAMEPANELESC: return L"MENU_NAMEPANELESC"; 9867 case MENU_NAMEPANELESC: return L"MENU_NAMEPANELESC";
9870 case MENU_CREDITSPROC: return L"MENU_CREDITSPROC"; 9868 case MENU_CREDITSPROC: return L"MENU_CREDITSPROC";
9871 case MENU_LOADINGPROC: return L"MENU_LOADINGPROC"; 9869 case MENU_LoadingProcInMainMenu: return L"MENU_LoadingProcInMainMenu";
9872 case MENU_10: return L"MENU_10"; 9870 case MENU_10: return L"MENU_10";
9873 case MENU_CREDITSCLOSE: return L"MENU_CREDITSCLOSE"; 9871 case MENU_CREDITSCLOSE: return L"MENU_CREDITSCLOSE";
9874 default: return L"unk"; 9872 default: return L"unk";
9875 }; 9873 };
9876 }; 9874 };