Mercurial > mm7
diff mm7_4.cpp @ 266:006188b68143
Merge
author | Nomad |
---|---|
date | Mon, 18 Feb 2013 10:06:38 +0200 |
parents | fb890fb66cad |
children | ac44e716d051 |
line wrap: on
line diff
--- a/mm7_4.cpp Mon Feb 18 10:04:47 2013 +0200 +++ b/mm7_4.cpp Mon Feb 18 10:06:38 2013 +0200 @@ -8998,26 +8998,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 ) @@ -9036,13 +9022,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); } @@ -10156,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); @@ -14071,9 +14051,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,