Mercurial > mm7

comparison mm7_2.cpp @ 1215:68655becb94b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Grumpy7
date Sun, 09 Jun 2013 16:27:57 +0200
parents 0d6c7ff3cddd fd3bea473c0c
children d3bf0d4fb753
comparison
equal deleted inserted replaced
1214:0d6c7ff3cddd 1215:68655becb94b
877 if ( uNumDialogueNPCPortraits > 0 ) 877 if ( uNumDialogueNPCPortraits > 0 )
878 { 878 {
879 //v3 = byte_591180; 879 //v3 = byte_591180;
880 do 880 do
881 { 881 {
882 HouseNPCData[v2 + 7] = (NPCData *)window_SpeakInHouse->CreateButton(pNPCPortraits_x[v1 - 1][v2], pNPCPortraits_y[v1 - 1][v2], 882 dword_5913F4[v2] = window_SpeakInHouse->CreateButton(pNPCPortraits_x[v1 - 1][v2], pNPCPortraits_y[v1 - 1][v2],
883 0x3Fu, 0x49u, 1, 0, UIMSG_ClickHouseNPCPortrait, v2, 0, byte_591180[v2].data(), 0, 0, 0); 883 0x3Fu, 0x49u, 1, 0, UIMSG_ClickHouseNPCPortrait, v2, 0, byte_591180[v2].data(), 0, 0, 0);
884 v1 = uNumDialogueNPCPortraits; 884 v1 = uNumDialogueNPCPortraits;
885 ++v2; 885 ++v2;
886 //v3 += 100; 886 //v3 += 100;
887 } 887 }