# HG changeset patch
# User Ritor1
# Date 1361170311 -21600
# Node ID fb890fb66cad13d7a2907ccdc1a175cfd4226b28
# Parent  8cf4fe6b4941344a3d04f1006f0733981aa49ccd
^Pi[%s]%s

diff -r 8cf4fe6b4941 -r fb890fb66cad GUIWindow.cpp
--- a/GUIWindow.cpp	Mon Feb 18 12:38:38 2013 +0600
+++ b/GUIWindow.cpp	Mon Feb 18 12:51:51 2013 +0600
@@ -221,7 +221,7 @@
   pRenderer->DrawTextureTransparent(uFrameX + 24, uFrameY + 24, v13);
   v16 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
   sprintf(pTmpBuf, "\xC%05d", v16);
-  sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);
+  sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);
   strcat(pTmpBuf, pTmpBuf2);
   strcat(pTmpBuf, "\xC" "00000\n");
   v20 = UI_GetHealthManaStringColor(pPlayer->sHealth, pPlayer->GetMaxHealth());
@@ -1155,7 +1155,7 @@
   }
   else
   {
-    sprintf( pTmpBuf, pGlobalTXT_LocalizationStrings[429],
+    sprintfex( pTmpBuf, pGlobalTXT_LocalizationStrings[429],
       //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C],
       p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterName,
       //p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]);
diff -r 8cf4fe6b4941 -r fb890fb66cad MM7.vcxproj.filters
--- a/MM7.vcxproj.filters	Mon Feb 18 12:38:38 2013 +0600
+++ b/MM7.vcxproj.filters	Mon Feb 18 12:51:51 2013 +0600
@@ -320,6 +320,7 @@
     <ClCompile Include="StorylineTextTable.cpp" />
     <ClCompile Include="texts.cpp" />
     <ClCompile Include="mm7text_ru.cpp" />
+    <ClCompile Include="NPC.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Might and Magic Trilogy.rc" />
diff -r 8cf4fe6b4941 -r fb890fb66cad mm7_1.cpp
--- a/mm7_1.cpp	Mon Feb 18 12:38:38 2013 +0600
+++ b/mm7_1.cpp	Mon Feb 18 12:51:51 2013 +0600
@@ -3154,7 +3154,7 @@
     v37 = v112[6];
     if ( v37 )
     {
-      sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]);
+      sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]);
     }
 	else
 	{
diff -r 8cf4fe6b4941 -r fb890fb66cad mm7_4.cpp
--- a/mm7_4.cpp	Mon Feb 18 12:38:38 2013 +0600
+++ b/mm7_4.cpp	Mon Feb 18 12:51:51 2013 +0600
@@ -10136,7 +10136,7 @@
   v7 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0x15u, 0x99u, 0xE9u);
   v8 = v6->uProfession;
   if ( v8 )
-    sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], v6->pName, aNPCProfessionNames[v8]);
+    sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], v6->pName, aNPCProfessionNames[v8]);
   else
     strcpy(pTmpBuf, v6->pName);
   a1.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v7, pTmpBuf, 3u);
diff -r 8cf4fe6b4941 -r fb890fb66cad mm7_5.cpp
--- a/mm7_5.cpp	Mon Feb 18 12:38:38 2013 +0600
+++ b/mm7_5.cpp	Mon Feb 18 12:51:51 2013 +0600
@@ -3505,7 +3505,7 @@
           goto _sprintex_2args_draw_status_and_continue;
         case UIMSG_ShowStatus_Player:
           pPlayer5 = pPlayers[uMessageParam];
-          sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"
+          sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"
           strcat(pTmpBuf, ": ");
           v107 = pPlayer5->GetMajorConditionIdx();
           strcat(pTmpBuf, aCharacterConditionNames[v107]);
@@ -16096,7 +16096,7 @@
         {
           v10 = v6->pName;
           v11 = pTmpBuf;
-          sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], v10, aNPCProfessionNames[v9]);
+          sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], v10, aNPCProfessionNames[v9]);
         }
         else
         {