# HG changeset patch
# User Ritor1
# Date 1363434179 -21600
# Node ID 964323fa0d25e21661fb480fbb46d3f9b8ac25f4
# Parent  277c05c3a89f4bc0a52606e863c942094ae122f3# Parent  c93f29773f84a61e164421a8171c509fe6a3df5c
Слияние

diff -r c93f29773f84 -r 964323fa0d25 Player.cpp
--- a/Player.cpp	Sat Mar 16 14:33:23 2013 +0200
+++ b/Player.cpp	Sat Mar 16 17:42:59 2013 +0600
@@ -8979,7 +8979,7 @@
               goto LABEL_82;
             case VAR_FixedFood:
               Party::GiveFood(val);
-              sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[502], val);
+              sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[502], val);
               ShowStatusBarString(pTmpBuf, 2u);
               if ( pParty->uNumFoodRations > 0xFFFF )
                 Party::SetFood(0xFFFFu);
diff -r c93f29773f84 -r 964323fa0d25 mm7_5.cpp
--- a/mm7_5.cpp	Sat Mar 16 14:33:23 2013 +0200
+++ b/mm7_5.cpp	Sat Mar 16 17:42:59 2013 +0600
@@ -16881,7 +16881,7 @@
       if ( v15 > v14->uLevel )
         sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[147], v15);
       v16 = sub_4B46F8(v15) - LODWORD(v14->uExperience);
-      sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[538], v16, v15 + 1);
+      sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[538], v16, v15 + 1);
       strcat(pTmpBuf, "\n");
       strcat(pTmpBuf, pTmpBuf2);
       LOBYTE(_y) = sprintf(pTmpBuf2, "%s\n \n%s", pPlayerExperienceAttributeDescription, pTmpBuf);
@@ -17104,7 +17104,7 @@
   pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0));
   v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
   sprintf(pTmpBuf, "\f%05d", v3);
-  sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s
+  sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s
   strcat(pTmpBuf, pTmpBuf2);
   if ( pPlayer->uSkillPoints )
     v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
diff -r c93f29773f84 -r 964323fa0d25 stru9.cpp
--- a/stru9.cpp	Sat Mar 16 14:33:23 2013 +0200
+++ b/stru9.cpp	Sat Mar 16 17:42:59 2013 +0600
@@ -30,7 +30,6 @@
   //int a3b; // [sp+38h] [bp+10h]@25
 
   //__debugbreak();
-
   //thisa = this;
 
   static RenderVertexSoft static_AE3FB4;