Mercurial > mm7

comparison NPC.cpp @ 1633:384a6b9d1333

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Tue, 17 Sep 2013 12:40:37 +0200
parents 5792fdafe2f5
children d453ed393d6e
comparison
equal deleted inserted replaced
1632:69ab7593e7af 1633:384a6b9d1333
1645 pDialogueWindow->Release(); 1645 pDialogueWindow->Release();
1646 } 1646 }
1647 else 1647 else
1648 { 1648 {
1649 for ( i = 0; i < uNumDialogueNPCPortraits; ++i ) 1649 for ( i = 0; i < uNumDialogueNPCPortraits; ++i )
1650 dword_5913F4[i]->Release(); 1650 HouseNPCPortraitsButtonsList[i]->Release();
1651 } 1651 }
1652 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0); 1652 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0);
1653 pBtn_ExitCancel = pDialogueWindow->CreateButton( 471u, 445u, 169u, 35u, 1, 0, UIMSG_Escape, 0, 0, 1653 pBtn_ExitCancel = pDialogueWindow->CreateButton( 471u, 445u, 169u, 35u, 1, 0, UIMSG_Escape, 0, 0,
1654 pGlobalTXT_LocalizationStrings[74],// "End Conversation" 1654 pGlobalTXT_LocalizationStrings[74],// "End Conversation"
1655 pIcons_LOD->GetTexture(uExitCancelTextureId), 0); 1655 pIcons_LOD->GetTexture(uExitCancelTextureId), 0);