Mercurial > mm7
diff mm7_4.cpp @ 262:2d6dda2e0405
m
author | Ritor1 |
---|---|
date | Mon, 18 Feb 2013 12:38:07 +0600 |
parents | 83f85ab6079a |
children | 8cf4fe6b4941 |
line wrap: on
line diff
--- 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,