Mercurial > might-and-magic-trilogy
diff GUIWindow.cpp @ 80:a84fb3752681
28.10.12
author | Ritor1 |
---|---|
date | Sun, 28 Oct 2012 22:13:23 +0600 |
parents | 30ec77bbd018 |
children | 2d5d13376e91 |
line wrap: on
line diff
--- a/GUIWindow.cpp Sun Oct 28 09:20:28 2012 +0600 +++ b/GUIWindow.cpp Sun Oct 28 22:13:23 2012 +0600 @@ -254,33 +254,33 @@ } pRenderer->DrawTextureTransparent(v1->uFrameX + 24, v1->uFrameY + 24, v13); v16 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); - sprintfex(pTmpBuf, "\xC" "00000\n", v16); - sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->uClass]); + sprintf(pTmpBuf, "\xC" "00000\n", v16); + sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->uClass]); strcat(pTmpBuf, pTmpBuf2); strcat(pTmpBuf, "\xC" "00000\n"); v17 = pPlayer->GetMaxHealth(); v18 = pPlayer->sHealth; v19 = pPlayer->GetMaxHealth(); v20 = sub_4178FE(pPlayer->sHealth, v19); - sprintfex(pTmpBuf2, "%s : ", pGlobalTXT_LocalizationStrings[108], v20, v18, v17); + sprintf(pTmpBuf2, "%s : ", pGlobalTXT_LocalizationStrings[108], v20, v18, v17); strcat(pTmpBuf, pTmpBuf2); v21 = pPlayer->GetMaxMana(); v22 = pPlayer->sMana; v23 = pPlayer->GetMaxMana(); v24 = sub_4178FE(pPlayer->sMana, v23); - sprintfex(pTmpBuf2, "%s : ", pGlobalTXT_LocalizationStrings[212], v24, v22, v21); + sprintf(pTmpBuf2, "%s : ", pGlobalTXT_LocalizationStrings[212], v24, v22, v21); strcat(pTmpBuf, pTmpBuf2); v25 = pPlayer->GetMajorConditionIdx(); v26 = aCharacterConditionNames[v25]; v27 = GetConditionDrawColor(v25); - sprintfex(pTmpBuf2, "%s: ", pGlobalTXT_LocalizationStrings[47], v27, v26); + sprintf(pTmpBuf2, "%s: ", pGlobalTXT_LocalizationStrings[47], v27, v26); strcat(pTmpBuf, pTmpBuf2); v28 = pPlayer->uQuickSpell; if ( v28 ) v29 = pSpellStats->pInfos[v28].pShortName; else v29 = pGlobalTXT_LocalizationStrings[153]; - sprintfex(pTmpBuf2, "%s: %s", pGlobalTXT_LocalizationStrings[172], v29); + sprintf(pTmpBuf2, "%s: %s", pGlobalTXT_LocalizationStrings[172], v29); strcat(pTmpBuf, pTmpBuf2); v30 = 0; a1->DrawText(pFontArrus, 120, 22, 0, pTmpBuf, 0, 0, 0); @@ -315,7 +315,7 @@ v39 = ""; if ( uFramesetIDa == v30 ) v39 = pGlobalTXT_LocalizationStrings[153]; - sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[450], v39); + sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[450], v39); return a1->DrawText(pFontArrus, 14, 114, v30, pTmpBuf, v30, v30, v30); } @@ -1169,9 +1169,9 @@ *(&pTexture_pagemask + v0) = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture( (const char *)pLloydsBeacons_SomeYs[v0 + 4], TEXTURE_16BIT_PALETTE)]; - sprintfex(pTmpBuf, "tab%da", v0); + sprintf(pTmpBuf, "tab%da", v0); *(v1 - 1) = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE)]; - sprintfex(pTmpBuf, "tab%db", v0++); + sprintf(pTmpBuf, "tab%db", v0++); *v1 = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE)]; v1 += 2; } @@ -1206,7 +1206,7 @@ v2 = uSlot; v7 = uPlayer; v3 = uSlot + 1; - sprintfex(pContainerName, "data\\lloyd%d%d.pcx", uPlayer, uSlot + 1); + sprintf(pContainerName, "data\\lloyd%d%d.pcx", uPlayer, uSlot + 1); v4 = fopen(pContainerName, "rb"); if ( v4 ) { @@ -1215,7 +1215,7 @@ } else { - sprintfex(pContainerName, "lloyd%d%d.pcx", v7, v3); + sprintf(pContainerName, "lloyd%d%d.pcx", v7, v3); v5 = pNew_LOD->FindContainer(pContainerName, 1); if ( v5 ) pSavegameThumbnails[v2].LoadFromFILE(v5, 0, 0); @@ -1488,7 +1488,7 @@ } else { - sprintfex( + sprintf( pTmpBuf, pGlobalTXT_LocalizationStrings[429], //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C], @@ -1620,7 +1620,7 @@ v8 = pGlobalTXT_LocalizationStrings[57]; if ( v18 <= 1 ) v8 = pGlobalTXT_LocalizationStrings[56]; - sprintfex(pTmpBuf2, "%d %s ", v18, v8); + sprintf(pTmpBuf2, "%d %s ", v18, v8); strcat(pTmpBuf, pTmpBuf2); } if ( v7 ) @@ -1629,7 +1629,7 @@ v9 = pGlobalTXT_LocalizationStrings[109]; else v9 = pGlobalTXT_LocalizationStrings[110]; - sprintfex(pTmpBuf2, "%d %s ", v7, v9); + sprintf(pTmpBuf2, "%d %s ", v7, v9); strcat(pTmpBuf, pTmpBuf2); } if ( v16 && !v18 ) @@ -1638,7 +1638,7 @@ v10 = pGlobalTXT_LocalizationStrings[437]; else v10 = pGlobalTXT_LocalizationStrings[436]; - sprintfex(pTmpBuf2, "%d %s ", v16, v10); + sprintf(pTmpBuf2, "%d %s ", v16, v10); strcat(pTmpBuf, pTmpBuf2); } if ( v17 && !v7 ) @@ -1647,7 +1647,7 @@ v11 = pGlobalTXT_LocalizationStrings[439]; else v11 = pGlobalTXT_LocalizationStrings[438]; - sprintfex(pTmpBuf2, "%d %s ", v17, v11); + sprintf(pTmpBuf2, "%d %s ", v17, v11); strcat(pTmpBuf, pTmpBuf2); } v12 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); @@ -2357,7 +2357,7 @@ 0); if ( v12->uFlags & 0x80 ) { - sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[408], v12->pName); + sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[408], v12->pName); pWindow->CreateButton(0x1E0u, v11 + 130, 0x8Cu, v11, 1, 0, 0x88u, 0x4Cu, 0, pTmpBuf, 0); } else @@ -2484,7 +2484,7 @@ v30 = v27; v29 = pGlobalTXT_LocalizationStrings[435]; } - sprintfex(&byte_591180[100 * v26], v29, v30); + sprintf(&byte_591180[100 * v26], v29, v30); array_5913D8[v26 + 7] = (NPCData *)pWindow->CreateButton( *(&_4E5E50_transui_x + v26 + 6 * uNumDialogueNPCPortraits - 6), *(&_4E5EE0_transui_y + v26 + 6 * uNumDialogueNPCPortraits - 6),