Mercurial > mm7

comparison UI/UIHouses.cpp @ 1435:94e4c3ef9b8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 05 Jul 2013 21:16:12 +0600
parents 03d6ea33a8c9 ae6c8e1ddef4
children 468f434a8d8a
comparison
equal deleted inserted replaced
1434:03d6ea33a8c9 1435:94e4c3ef9b8e
525 { 525 {
526 if (pNPCStats->pNewNPCData[i].Location2D == house ) 526 if (pNPCStats->pNewNPCData[i].Location2D == house )
527 { 527 {
528 if (!(pNPCStats->pNewNPCData[i].uFlags & 0x80)) 528 if (!(pNPCStats->pNewNPCData[i].uFlags & 0x80))
529 { 529 {
530 530 HouseNPCData[uNumDialogueNPCPortraits+1-((dword_591080 != 0) ? 1 : 0) ] = &pNPCStats->pNewNPCData[i];
531 HouseNPCData[uNumDialogueNPCPortraits+1- (dword_591080 != 0) ? 1 : 0] = &pNPCStats->pNewNPCData[i];
532 npc_id_arr[uNumDialogueNPCPortraits] = pNPCStats->pNewNPCData[i].uPortraitID; 531 npc_id_arr[uNumDialogueNPCPortraits] = pNPCStats->pNewNPCData[i].uPortraitID;
533 ++uNumDialogueNPCPortraits; 532 ++uNumDialogueNPCPortraits;
534 if ((pNPCStats->pNewNPCData[i].uFlags & 3) != 2) 533 if ((pNPCStats->pNewNPCData[i].uFlags & 3) != 2)
535 ++pNPCStats->pNewNPCData[i].uFlags; 534 ++pNPCStats->pNewNPCData[i].uFlags;
536 } 535 }