Mercurial > might-and-magic-trilogy
diff GUIWindow.cpp @ 83:2d5d13376e91
Merge
author | Nomad |
---|---|
date | Mon, 29 Oct 2012 00:49:33 +0200 |
parents | f9a33f75bae3 a84fb3752681 |
children | b39bdc150e90 |
line wrap: on
line diff
--- a/GUIWindow.cpp Mon Oct 29 00:41:51 2012 +0200 +++ b/GUIWindow.cpp Mon Oct 29 00:49:33 2012 +0200 @@ -1117,9 +1117,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; } @@ -1154,7 +1154,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 ) { @@ -1163,7 +1163,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); @@ -1436,7 +1436,7 @@ } else { - sprintfex( + sprintf( pTmpBuf, pGlobalTXT_LocalizationStrings[429], //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C], @@ -1568,7 +1568,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 ) @@ -1577,7 +1577,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 ) @@ -1586,7 +1586,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 ) @@ -1595,7 +1595,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); @@ -2305,7 +2305,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 @@ -2432,7 +2432,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),