# HG changeset patch
# User Ritor1
# Date 1361169518 -21600
# Node ID 8cf4fe6b4941344a3d04f1006f0733981aa49ccd
# Parent  2d6dda2e04053370e4cfa8b4d41a1c86acd291b1# Parent  96f3a1177b3796825deea50783595312196362bc
Слияние

diff -r 96f3a1177b37 -r 8cf4fe6b4941 MM7.vcxproj.filters
--- a/MM7.vcxproj.filters	Mon Feb 18 09:20:47 2013 +0200
+++ b/MM7.vcxproj.filters	Mon Feb 18 12:38:38 2013 +0600
@@ -317,7 +317,9 @@
     <ClCompile Include="FrameTableInc.cpp" />
     <ClCompile Include="mm7_6.cpp" />
     <ClCompile Include="GameUIs.cpp" />
+    <ClCompile Include="StorylineTextTable.cpp" />
     <ClCompile Include="texts.cpp" />
+    <ClCompile Include="mm7text_ru.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Might and Magic Trilogy.rc" />
diff -r 96f3a1177b37 -r 8cf4fe6b4941 mm7_1.cpp
diff -r 96f3a1177b37 -r 8cf4fe6b4941 mm7_2.cpp
--- a/mm7_2.cpp	Mon Feb 18 09:20:47 2013 +0200
+++ b/mm7_2.cpp	Mon Feb 18 12:38:38 2013 +0600
@@ -415,7 +415,7 @@
 // F8B19C: using guessed type int dword_F8B19C;
 
 //----- (004B8285) --------------------------------------------------------
-void __cdecl sub_4B8285_prolly_draw_arcomage_result()
+void __cdecl sub_4B8285_prolly_draw_arcomage_result()//Maybe TavernDialogue
 {
   GUIWindow *v0; // ebx@1
   Player *v1; // edi@1
diff -r 96f3a1177b37 -r 8cf4fe6b4941 mm7_3.cpp
--- a/mm7_3.cpp	Mon Feb 18 09:20:47 2013 +0200
+++ b/mm7_3.cpp	Mon Feb 18 12:38:38 2013 +0600
@@ -15033,7 +15033,6 @@
     return pNPCTopics[407].pTopic;
 }
 
-
 //----- (00445350) --------------------------------------------------------
 void __cdecl DrawDialogueUI()
 {
diff -r 96f3a1177b37 -r 8cf4fe6b4941 mm7_4.cpp
--- a/mm7_4.cpp	Mon Feb 18 09:20:47 2013 +0200
+++ b/mm7_4.cpp	Mon Feb 18 12:38:38 2013 +0600
@@ -8998,26 +8998,12 @@
     v5 = v13;
   if ( v4 > v5 )
     v5 = v4;
-  sprintf(
-    pTmpBuf2,
-    "%s\n\n%s\t%03d:\t%03d%s\t000\n%s\t%03d:\t%03d%s\t000\n%s\t%03d:\t%03d%s\t000\n%s\t%03d:\t%03d%s",
-    pSpellStats->pInfos[v1].pDescription,
-    pGlobalTXT_LocalizationStrings[431],        // "Normal"
-    v5 + 3,
-    v5 + 10,
-    pSpellStats->pInfos[v1].pBasicSkillDesc,
-    pGlobalTXT_LocalizationStrings[433],        // "Expert"
-    v5 + 3,
-    v5 + 10,
-    pSpellStats->pInfos[v1].pExpertSkillDesc,
-    pGlobalTXT_LocalizationStrings[432],        // "Master"
-    v5 + 3,
-    v5 + 10,
-    pSpellStats->pInfos[v1].pMasterSkillDesc,
-    pGlobalTXT_LocalizationStrings[96],         // "Grand"
-    v5 + 3,
-    v5 + 10,
-    pSpellStats->pInfos[v1].pGrandmasterSkillDesc);
+  sprintf(pTmpBuf2, "%s\n\n%s\t%03d:\t%03d%s\t000\n%s\t%03d:\t%03d%s\t000\n%s\t%03d:\t%03d%s\t000\n%s\t%03d:\t%03d%s",
+    pSpellStats->pInfos[v1].pDescription, pGlobalTXT_LocalizationStrings[431],        // "Normal"
+    v5 + 3, v5 + 10, pSpellStats->pInfos[v1].pBasicSkillDesc, pGlobalTXT_LocalizationStrings[433],        // "Expert"
+    v5 + 3, v5 + 10, pSpellStats->pInfos[v1].pExpertSkillDesc, pGlobalTXT_LocalizationStrings[432],        // "Master"
+    v5 + 3, v5 + 10, pSpellStats->pInfos[v1].pMasterSkillDesc, pGlobalTXT_LocalizationStrings[96],         // "Grand"
+    v5 + 3, v5 + 10, pSpellStats->pInfos[v1].pGrandmasterSkillDesc);
   v6 = pFontSmallnum->CalcTextHeight(pTmpBuf2, &a1, 0, 0);
   a1.uFrameHeight += v6;
   if ( (signed int)a1.uFrameHeight < 150 )
@@ -9036,13 +9022,7 @@
   a1.uFrameWidth = 108;
   a1.DrawTitleText(pFontComic, 0xCu, 0x4Bu, 0, pSkillNames[v11 / 4 + 12], 3u);
   sprintf(pTmpBuf, "%s\n%d", pGlobalTXT_LocalizationStrings[522], *(&pSpellDatas[0].uNormalLevelMana + 10 * v1));
-  return a1.DrawTitleText(
-           pFontComic,
-           0xCu,
-           a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16,
-           0,
-           pTmpBuf,
-           3u);
+  return a1.DrawTitleText(pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, 0, pTmpBuf, 3);
 }
 
 
@@ -14071,9 +14051,7 @@
           if ( v61 != (Player *)v2 )
           {
             memcpy(&v32, (char *)&pMapStats + 68 * (unsigned __int8)byte_4F09B0[v26 * 4], 0x44u);
-            sprintf(
-              pTmpBuf,
-              pGlobalTXT_LocalizationStrings[404],
+            sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[404],
               v66,
               *(int *)&v32,
               v33,
diff -r 96f3a1177b37 -r 8cf4fe6b4941 mm7_5.cpp
--- a/mm7_5.cpp	Mon Feb 18 09:20:47 2013 +0200
+++ b/mm7_5.cpp	Mon Feb 18 12:38:38 2013 +0600
@@ -16910,26 +16910,11 @@
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
 
     v23 = static_sub_417BB5_out_string;
-    sprintf(
-      static_sub_417BB5_out_string,
-      a2,
-      pSkillDesc[v28],
-      pGlobalTXT_LocalizationStrings[431],      // Normal
-      (char *)v35 + 3,
-      v35 + 5,
-      pNormalSkillDesc[v28],
-      pGlobalTXT_LocalizationStrings[433],      // Expert
-      (char *)v35 + 3,
-      v35 + 5,
-      pExpertSkillDesc[v28],
-      pGlobalTXT_LocalizationStrings[432],      // Master
-      (char *)v35 + 3,
-      v35 + 5,
-      pMasterSkillDesc[v28],
-      pGlobalTXT_LocalizationStrings[96],       // Grand
-      (char *)v35 + 3,
-      v35 + 5,
-      pGrandSkillDesc[v28]);
+    sprintf(static_sub_417BB5_out_string, a2, pSkillDesc[v28], pGlobalTXT_LocalizationStrings[431],      // Normal
+      (char *)v35 + 3, v35 + 5, pNormalSkillDesc[v28], pGlobalTXT_LocalizationStrings[433],      // Expert
+      (char *)v35 + 3, v35 + 5, pExpertSkillDesc[v28], pGlobalTXT_LocalizationStrings[432],      // Master
+      (char *)v35 + 3, v35 + 5, pMasterSkillDesc[v28], pGlobalTXT_LocalizationStrings[96],       // Grand
+      (char *)v35 + 3, v35 + 5, pGrandSkillDesc[v28]);
   }
   else
   {