diff mm7_1.cpp @ 262:2d6dda2e0405

m
author Ritor1
date Mon, 18 Feb 2013 12:38:07 +0600
parents 37dcbe8f3cca
children 8cf4fe6b4941
line wrap: on
line diff
--- a/mm7_1.cpp	Mon Feb 18 10:30:14 2013 +0600
+++ b/mm7_1.cpp	Mon Feb 18 12:38:07 2013 +0600
@@ -639,10 +639,7 @@
   v3 = pIcons_LOD->LoadTexture("fr_award", TEXTURE_16BIT_PALETTE);
   pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v3 != -1 ? (int)&pIcons_LOD->pTextures[v3] : 0));
   sprintf(pTmpBuf, "%s \f%05d", pGlobalTXT_LocalizationStrings[23], v2);// TODO check args
-  sprintf(Source,
-    pGlobalTXT_LocalizationStrings[429],
-	&pParty->pPlayers[v1-1].pName,
-	pClassNames[pParty->pPlayers[v1-1].classType]);
+  sprintf(Source, pGlobalTXT_LocalizationStrings[429], &pParty->pPlayers[v1-1].pName, pClassNames[pParty->pPlayers[v1-1].classType]);
   strcat(pTmpBuf, Source);
   strcat(pTmpBuf, "\xC" "00000");
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, 18, 0, pTmpBuf, 0, 0, 0);
@@ -3156,7 +3153,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
 	{
@@ -3470,21 +3467,10 @@
     a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
     v57 = v121->pMonsterInfo.uAttack1DamageBonus;
     if ( v57 )
-      sprintf(
-        pTmpBuf,
-        "%s\f%05u\t080%dd%d+%d\n",
-        pGlobalTXT_LocalizationStrings[53],
-        0,
-        v121->pMonsterInfo.uAttack1DamageDiceRolls,
-        v121->pMonsterInfo.uAttack1DamageDiceSides,
-        v57);
+      sprintf(pTmpBuf, "%s\f%05u\t080%dd%d+%d\n", pGlobalTXT_LocalizationStrings[53], 0, v121->pMonsterInfo.uAttack1DamageDiceRolls,
+        v121->pMonsterInfo.uAttack1DamageDiceSides, v57);
     else
-      sprintf(
-        pTmpBuf,
-        "%s\f%05u\t080%dd%d\n",
-        pGlobalTXT_LocalizationStrings[53],
-        0,
-        v121->pMonsterInfo.uAttack1DamageDiceRolls,
+      sprintf(pTmpBuf, "%s\f%05u\t080%dd%d\n", pGlobalTXT_LocalizationStrings[53], 0, v121->pMonsterInfo.uAttack1DamageDiceRolls,
         v121->pMonsterInfo.uAttack1DamageDiceSides);
   }
   else