# HG changeset patch
# User Ritor1
# Date 1372397655 -21600
# Node ID 2e3deb510de3c827d922fabf29d7f9db6bec78d7
# Parent  2ddb0af0f437d425b5163906c3e8a607364c3546# Parent  ae6c8e1ddef4d8520227db061cdd1e52576e5c03
Слияние

diff -r 2ddb0af0f437 -r 2e3deb510de3 GUIWindow.cpp
--- a/GUIWindow.cpp	Fri Jun 28 11:34:09 2013 +0600
+++ b/GUIWindow.cpp	Fri Jun 28 11:34:15 2013 +0600
@@ -1795,7 +1795,7 @@
         else
         {
           if ( v26 || !dword_591080 )
-            v27 = HouseNPCData[v26 +1 - (dword_591080 != 0)]->pName;
+            v27 = HouseNPCData[v26 +1 - ((dword_591080 != 0)? 1:0)]->pName;
           else
             v27 = (char*)p2DEvents[pButton - 1].pProprieterName;
           v30 = v27;
diff -r 2ddb0af0f437 -r 2e3deb510de3 NPC.cpp
--- a/NPC.cpp	Fri Jun 28 11:34:09 2013 +0600
+++ b/NPC.cpp	Fri Jun 28 11:34:15 2013 +0600
@@ -1305,7 +1305,7 @@
   //int v25; // [sp-4h] [bp-10h]@49
 
   uDialogueType = uMessageParam + 1;
-  pCurrentNPCInfo = HouseNPCData[(unsigned int)((char *)pDialogueNPCCount + -(dword_591080 != 0) )];//- 1
+  pCurrentNPCInfo = HouseNPCData[pDialogueNPCCount -((dword_591080 != 0)?1:0 )];//- 1
   if ( uMessageParam <= 24 )
   {
   switch ( uMessageParam )
@@ -1640,7 +1640,7 @@
   }
   else
   {
-    v17 = HouseNPCData[_this + 1 - ((dword_591080 != 0) )];//+ 1
+    v17 = HouseNPCData[_this + 1 - ((dword_591080 != 0)?1:0 )];//+ 1
     if ( dialog_menu_id == HOUSE_DIALOGUE_OTHER )
     {
       pDialogueWindow->Release();
diff -r 2ddb0af0f437 -r 2e3deb510de3 UI/UIHouses.cpp
--- a/UI/UIHouses.cpp	Fri Jun 28 11:34:09 2013 +0600
+++ b/UI/UIHouses.cpp	Fri Jun 28 11:34:15 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)