Mercurial > mm7

changeset 454:5e5dfedcc0ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 24 Feb 2013 09:18:17 +0600
parents eaadcb39312f (diff) 4f451a616d3d (current diff)
children 4c4584219da3
files GUIWindow.cpp NPC.cpp mm7_1.cpp mm7_4.cpp mm7_data.h
diffstat 5 files changed, 8 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/GUIWindow.cpp	Sun Feb 24 03:07:03 2013 +0200
+++ b/GUIWindow.cpp	Sun Feb 24 09:18:17 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;
     }
@@ -1121,10 +1119,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;
@@ -1133,7 +1128,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[0][0] - 4, pNPCPortraits_y[0][0] - 4, &pIcons_LOD->pTextures[uTextureID_50795C]);
@@ -1145,7 +1141,7 @@
   }
   if ( v4 || !dword_591080 )
   {
-    SimpleHouseDialog();
+    SimpleHouseAndBoatsDialog();
   }
   else
   {
@@ -1215,7 +1211,8 @@
           {
             if ( dword_F8B198 != 31 )
               break;
-            goto LABEL_36;
+            sub_4B4F4F();
+            goto LABEL_58;
           }
           TrainingDialog();
         }
--- a/NPC.cpp	Sun Feb 24 03:07:03 2013 +0200
+++ b/NPC.cpp	Sun Feb 24 09:18:17 2013 +0600
@@ -670,7 +670,6 @@
 		pNPCDataBuff->joins = 1;
 	}
 
-
 //----- (00476387) --------------------------------------------------------
 bool PartyHasDragon()
 {
--- a/mm7_1.cpp	Sun Feb 24 03:07:03 2013 +0200
+++ b/mm7_1.cpp	Sun Feb 24 09:18:17 2013 +0600
@@ -3518,8 +3518,6 @@
   return result;
 }
 
-
-
 //----- (0041F54A) --------------------------------------------------------
 void __cdecl LoadActualSkyFrame()
 {
--- a/mm7_4.cpp	Sun Feb 24 03:07:03 2013 +0200
+++ b/mm7_4.cpp	Sun Feb 24 09:18:17 2013 +0600
@@ -10035,7 +10035,7 @@
 
 
 //----- (004B2A74) --------------------------------------------------------
-char __cdecl SimpleHouseDialog()
+char __cdecl SimpleHouseAndBoatsDialog()
 {
   char *v0; // esi@3
   char *v1; // ST1C_4@3
--- a/mm7_data.h	Sun Feb 24 03:07:03 2013 +0200
+++ b/mm7_data.h	Sun Feb 24 09:18:17 2013 +0600
@@ -2306,7 +2306,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