Mercurial > mm7
diff UI/UIHouses.cpp @ 1435:94e4c3ef9b8e
Слияние
author | Ritor1 |
---|---|
date | Fri, 05 Jul 2013 21:16:12 +0600 |
parents | 03d6ea33a8c9 ae6c8e1ddef4 |
children | 468f434a8d8a |
line wrap: on
line diff
--- a/UI/UIHouses.cpp Fri Jul 05 21:15:53 2013 +0600 +++ b/UI/UIHouses.cpp Fri Jul 05 21:16:12 2013 +0600 @@ -527,8 +527,7 @@ { if (!(pNPCStats->pNewNPCData[i].uFlags & 0x80)) { - - HouseNPCData[uNumDialogueNPCPortraits+1- (dword_591080 != 0) ? 1 : 0] = &pNPCStats->pNewNPCData[i]; + HouseNPCData[uNumDialogueNPCPortraits+1-((dword_591080 != 0) ? 1 : 0) ] = &pNPCStats->pNewNPCData[i]; npc_id_arr[uNumDialogueNPCPortraits] = pNPCStats->pNewNPCData[i].uPortraitID; ++uNumDialogueNPCPortraits; if ((pNPCStats->pNewNPCData[i].uFlags & 3) != 2)