Mercurial > mm7

comparison mm7_2.cpp @ 424:afad358dc684

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Sat, 23 Feb 2013 23:15:31 +0400
parents 88c30918eef7 ad1e9c0bf6da
children 24936a5ff8ca 58b71c1af7d8
comparison
equal deleted inserted replaced
423:88c30918eef7 424:afad358dc684
4373 if ( uNumDialogueNPCPortraits > 0 ) 4373 if ( uNumDialogueNPCPortraits > 0 )
4374 { 4374 {
4375 v3 = byte_591180; 4375 v3 = byte_591180;
4376 do 4376 do
4377 { 4377 {
4378 array_5913D8[v2 + 7] = (NPCData *)window_SpeakInHouse->CreateButton(*(&pNPCPortraits_x + v2 + 6 * v1 - 6), *(&pNPCPortraits_y + v2 + 6 * v1 - 6), 4378 array_5913D8[v2 + 7] = (NPCData *)window_SpeakInHouse->CreateButton(pNPCPortraits_x[v1 - 1][v2], pNPCPortraits_y[v1 - 1][v2],
4379 0x3Fu, 0x49u, 1, 0, 0x19Au, v2, 0, v3, 0, 0, 0); 4379 0x3Fu, 0x49u, 1, 0, 0x19Au, v2, 0, v3, 0, 0, 0);
4380 v1 = uNumDialogueNPCPortraits; 4380 v1 = uNumDialogueNPCPortraits;
4381 ++v2; 4381 ++v2;
4382 v3 += 100; 4382 v3 += 100;
4383 } 4383 }