Mercurial > mm7

changeset 262:2d6dda2e0405

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Mon, 18 Feb 2013 12:38:07 +0600
parents c3bfe1eb3de7
children 8cf4fe6b4941
files mm7_1.cpp mm7_2.cpp mm7_4.cpp mm7_5.cpp
diffstat 4 files changed, 19 insertions(+), 70 deletions(-) [+]
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
--- a/mm7_2.cpp	Mon Feb 18 10:30:14 2013 +0600
+++ b/mm7_2.cpp	Mon Feb 18 12:38:07 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
--- a/mm7_4.cpp	Mon Feb 18 10:30:14 2013 +0600
+++ b/mm7_4.cpp	Mon Feb 18 12:38:07 2013 +0600
@@ -8990,26 +8990,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 )
@@ -9028,13 +9014,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);
 }
 
 
@@ -14063,9 +14043,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,
--- a/mm7_5.cpp	Mon Feb 18 10:30:14 2013 +0600
+++ b/mm7_5.cpp	Mon Feb 18 12:38:07 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
   {