# HG changeset patch
# User Ritor1
# Date 1361641580 -21600
# Node ID ee47cc585e1ba29af52050327d17b3050c93567b
# Parent  7c6e683074840cf18f125e2f5d523b01847754f6# Parent  913675aac25bdc6bc9bfe2c46d1dc95948e36b7b
Слияние

diff -r 913675aac25b -r ee47cc585e1b GUIWindow.cpp
--- a/GUIWindow.cpp	Sat Feb 23 19:34:05 2013 +0200
+++ b/GUIWindow.cpp	Sat Feb 23 23:46:20 2013 +0600
@@ -1016,7 +1016,6 @@
 }
 // 50640C: using guessed type int dword_50640C[];
 
-
 //----- (004B3157) --------------------------------------------------------
 void GUIWindow::HouseDialogManager()
 {
@@ -1073,7 +1072,6 @@
   {
     if ( dword_F8B198 == 31 )
     {
-LABEL_36:
       sub_4B4F4F();
       goto LABEL_58;
     }
@@ -1118,10 +1116,7 @@
         v15 = 3;
         //v13 = (char *)p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C];
         v13 = (char *)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterTitle;
-        v11 = v19;
-        v10 = 113;
-LABEL_56:
-        v18.DrawTitleText(pFontCreate, 0x1E3u, v10, v11, v13, v15);
+        v18.DrawTitleText(pFontCreate, 0x1E3u, 113, v19, v13, 3);
         goto LABEL_57;
       }
       v15 = 3;
@@ -1130,7 +1125,8 @@
     }
     v11 = v19;
     v10 = v9;
-    goto LABEL_56;
+    v18.DrawTitleText(pFontCreate, 0x1E3u, v10, v11, v13, v15);
+    goto LABEL_57;
   }
   v4 = (char *)array_5913D8[6] - 1;
   pRenderer->DrawTextureIndexed(pNPCPortraits_x - 4, pNPCPortraits_y - 4, &pIcons_LOD->pTextures[uTextureID_50795C]);
@@ -1142,7 +1138,7 @@
   }
   if ( v4 || !dword_591080 )
   {
-    SimpleHouseDialog();
+    SimpleHouseAndBoatsDialog();
   }
   else
   {
@@ -1212,7 +1208,8 @@
           {
             if ( dword_F8B198 != 31 )
               break;
-            goto LABEL_36;
+            sub_4B4F4F();
+            goto LABEL_58;
           }
           TrainingDialog();
         }
diff -r 913675aac25b -r ee47cc585e1b mm7_4.cpp
--- a/mm7_4.cpp	Sat Feb 23 19:34:05 2013 +0200
+++ b/mm7_4.cpp	Sat Feb 23 23:46:20 2013 +0600
@@ -10034,7 +10034,7 @@
 
 
 //----- (004B2A74) --------------------------------------------------------
-char __cdecl SimpleHouseDialog()
+char __cdecl SimpleHouseAndBoatsDialog()
 {
   char *v0; // esi@3
   char *v1; // ST1C_4@3
diff -r 913675aac25b -r ee47cc585e1b mm7_data.h
--- a/mm7_data.h	Sat Feb 23 19:34:05 2013 +0200
+++ b/mm7_data.h	Sat Feb 23 23:46:20 2013 +0600
@@ -2308,7 +2308,7 @@
 void __fastcall sub_4B2001(signed int a1);
 char *__thiscall _4B254D_SkillMasteryTeacher(int _this);
 const char *__fastcall sub_4B29F2(int a1);
-char __cdecl SimpleHouseDialog();
+char __cdecl SimpleHouseAndBoatsDialog();
 struct GUIButton *__fastcall sub_4B36CC(int a1, unsigned int a2);
 int __thiscall sub_4B3703(void *_this);
 int __thiscall sub_4B3A72(int a1); // idb