# HG changeset patch
# User Nomad
# Date 1361174798 -7200
# Node ID 006188b681439719df95436c8bcc7a0789335c54
# Parent 96bc024a5fed2053d4f4dddfa78f9e6a89c74343# Parent fb890fb66cad13d7a2907ccdc1a175cfd4226b28
Merge
diff -r 96bc024a5fed -r 006188b68143 GUIWindow.cpp
--- a/GUIWindow.cpp Mon Feb 18 10:04:47 2013 +0200
+++ b/GUIWindow.cpp Mon Feb 18 10:06:38 2013 +0200
@@ -221,7 +221,7 @@
pRenderer->DrawTextureTransparent(uFrameX + 24, uFrameY + 24, v13);
v16 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
sprintf(pTmpBuf, "\xC%05d", v16);
- sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);
+ sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);
strcat(pTmpBuf, pTmpBuf2);
strcat(pTmpBuf, "\xC" "00000\n");
v20 = UI_GetHealthManaStringColor(pPlayer->sHealth, pPlayer->GetMaxHealth());
@@ -1155,7 +1155,7 @@
}
else
{
- sprintf( pTmpBuf, pGlobalTXT_LocalizationStrings[429],
+ sprintfex( pTmpBuf, pGlobalTXT_LocalizationStrings[429],
//p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C],
p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterName,
//p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]);
diff -r 96bc024a5fed -r 006188b68143 MM7.vcxproj.filters
--- a/MM7.vcxproj.filters Mon Feb 18 10:04:47 2013 +0200
+++ b/MM7.vcxproj.filters Mon Feb 18 10:06:38 2013 +0200
@@ -317,7 +317,10 @@
+
+
+
diff -r 96bc024a5fed -r 006188b68143 mm7_1.cpp
--- a/mm7_1.cpp Mon Feb 18 10:04:47 2013 +0200
+++ b/mm7_1.cpp Mon Feb 18 10:06:38 2013 +0200
@@ -3154,7 +3154,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
{
diff -r 96bc024a5fed -r 006188b68143 mm7_2.cpp
--- a/mm7_2.cpp Mon Feb 18 10:04:47 2013 +0200
+++ b/mm7_2.cpp Mon Feb 18 10:06:38 2013 +0200
@@ -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
diff -r 96bc024a5fed -r 006188b68143 mm7_3.cpp
--- a/mm7_3.cpp Mon Feb 18 10:04:47 2013 +0200
+++ b/mm7_3.cpp Mon Feb 18 10:06:38 2013 +0200
@@ -15033,7 +15033,6 @@
return pNPCTopics[407].pTopic;
}
-
//----- (00445350) --------------------------------------------------------
void __cdecl DrawDialogueUI()
{
diff -r 96bc024a5fed -r 006188b68143 mm7_4.cpp
--- 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,
diff -r 96bc024a5fed -r 006188b68143 mm7_5.cpp
--- a/mm7_5.cpp Mon Feb 18 10:04:47 2013 +0200
+++ b/mm7_5.cpp Mon Feb 18 10:06:38 2013 +0200
@@ -3505,7 +3505,7 @@
goto _sprintex_2args_draw_status_and_continue;
case UIMSG_ShowStatus_Player:
pPlayer5 = pPlayers[uMessageParam];
- sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"
+ sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"
strcat(pTmpBuf, ": ");
v107 = pPlayer5->GetMajorConditionIdx();
strcat(pTmpBuf, aCharacterConditionNames[v107]);
@@ -16096,7 +16096,7 @@
{
v10 = v6->pName;
v11 = pTmpBuf;
- sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], v10, aNPCProfessionNames[v9]);
+ sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], v10, aNPCProfessionNames[v9]);
}
else
{
@@ -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
{