Mercurial > mm7

comparison mm7_4.cpp @ 526:214d9d47cf1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Chest working, but items are not laid correctly
author Gloval
date Sun, 03 Mar 2013 01:55:57 +0400
parents 35f28d4c0ff9
children 9caf59edb1ee
comparison
equal deleted inserted replaced
525:e7b3fa10d58d 526:214d9d47cf1f
10625 ptr_F8B1E8 = (char *)pNPCTopics[pEventCode + 99].pText; 10625 ptr_F8B1E8 = (char *)pNPCTopics[pEventCode + 99].pText;
10626 ContractSelectText(pEventCode); 10626 ContractSelectText(pEventCode);
10627 pDialogueWindow->Release(); 10627 pDialogueWindow->Release();
10628 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15E, WINDOW_MainMenu, pEventCode, 0); 10628 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15E, WINDOW_MainMenu, pEventCode, 0);
10629 pBtn_ExitCancel = pDialogueWindow->CreateButton(0x1D7, 0x1BD, 0xA9, 0x23, 1, 0, 0x71, 0, 0, pGlobalTXT_LocalizationStrings[34], 10629 pBtn_ExitCancel = pDialogueWindow->CreateButton(0x1D7, 0x1BD, 0xA9, 0x23, 1, 0, 0x71, 0, 0, pGlobalTXT_LocalizationStrings[34],
10630 (Texture *)(uTextureID_506438 != -1 ? &pIcons_LOD->pTextures[uTextureID_506438] : 0), 0); 10630 (Texture *)(uExitCancelTextureId != -1 ? &pIcons_LOD->pTextures[uExitCancelTextureId] : 0), 0);
10631 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0); 10631 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0);
10632 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x52u, 0, pGlobalTXT_LocalizationStrings[122], 0); 10632 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x52u, 0, pGlobalTXT_LocalizationStrings[122], 0);
10633 pDialogueWindow->_41D08F(1, 1, 0, 2); 10633 pDialogueWindow->_41D08F(1, 1, 0, 2);
10634 dword_F8B19C = -1; 10634 dword_F8B19C = -1;
10635 } 10635 }
10648 pDialogueWindow->Release(); 10648 pDialogueWindow->Release();
10649 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15Eu, WINDOW_MainMenu, v1, 0); 10649 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15Eu, WINDOW_MainMenu, v1, 0);
10650 v2 = ""; 10650 v2 = "";
10651 pBtn_ExitCancel = pDialogueWindow->CreateButton( 0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, 0x71u, 0, 0, 10651 pBtn_ExitCancel = pDialogueWindow->CreateButton( 0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, 0x71u, 0, 0,
10652 pGlobalTXT_LocalizationStrings[34], 10652 pGlobalTXT_LocalizationStrings[34],
10653 (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0), 10653 (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0),
10654 0); 10654 0);
10655 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0); 10655 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0);
10656 if ( contract_approved ) 10656 if ( contract_approved )
10657 v2 = pGlobalTXT_LocalizationStrings[535]; 10657 v2 = pGlobalTXT_LocalizationStrings[535];
10658 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x4Fu, 0, v2, 0); 10658 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x4Fu, 0, v2, 0);
10681 0, 10681 0,
10682 0x71u, 10682 0x71u,
10683 0, 10683 0,
10684 0, 10684 0,
10685 pGlobalTXT_LocalizationStrings[34], 10685 pGlobalTXT_LocalizationStrings[34],
10686 (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0), 10686 (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0),
10687 0); 10687 0);
10688 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0); 10688 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0);
10689 if ( pNPCStats->pProfessions[v1->uProfession].pBenefits)//*(&pNPCStats->field_13A5C + 5 * v1->uProfession) ) 10689 if ( pNPCStats->pProfessions[v1->uProfession].pBenefits)//*(&pNPCStats->field_13A5C + 5 * v1->uProfession) )
10690 { 10690 {
10691 pDialogueWindow->CreateButton( 10691 pDialogueWindow->CreateButton(
10762 GUIButton::_41D0D8((GUIButton *)HouseNPCData[i + 7]); 10762 GUIButton::_41D0D8((GUIButton *)HouseNPCData[i + 7]);
10763 } 10763 }
10764 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0); 10764 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0);
10765 pBtn_ExitCancel = pDialogueWindow->CreateButton( 471u, 445u, 169u, 35u, 1, 0, 0x71u, 0, 0, 10765 pBtn_ExitCancel = pDialogueWindow->CreateButton( 471u, 445u, 169u, 35u, 1, 0, 0x71u, 0, 0,
10766 pGlobalTXT_LocalizationStrings[74],// "End Conversation" 10766 pGlobalTXT_LocalizationStrings[74],// "End Conversation"
10767 (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0), 0); 10767 (Texture *)(uExitCancelTextureId != -1 ? (int)&pIcons_LOD->pTextures[uExitCancelTextureId] : 0), 0);
10768 pDialogueWindow->CreateButton(8u, 8u, 0x1C2u, 0x140u, 1, 0, 0x51u, 0, 0, "", 0); 10768 pDialogueWindow->CreateButton(8u, 8u, 0x1C2u, 0x140u, 1, 0, 0x51u, 0, 0, "", 0);
10769 if ( pDialogueNPCCount == 1 && dword_591080 ) 10769 if ( pDialogueNPCCount == 1 && dword_591080 )
10770 { 10770 {
10771 sub_4B3B42(in_current_building_type); 10771 sub_4B3B42(in_current_building_type);
10772 } 10772 }