Mercurial > mm7
comparison mm7_2.cpp @ 1506:c76c0f6974bc
Слияние
author | Ritor1 |
---|---|
date | Mon, 02 Sep 2013 12:03:40 +0600 |
parents | 6306a33af531 ab6bf38b2940 |
children | a109bb203e28 |
comparison
equal
deleted
inserted
replaced
1505:6306a33af531 | 1506:c76c0f6974bc |
---|---|
441 pViewport->uViewportBR_X - pViewport->uViewportTL_X, | 441 pViewport->uViewportBR_X - pViewport->uViewportTL_X, |
442 pViewport->uViewportBR_Y - pViewport->uViewportTL_Y + 1, | 442 pViewport->uViewportBR_Y - pViewport->uViewportTL_Y + 1, |
443 pRenderer->uTargetGMask | pRenderer->uTargetBMask); | 443 pRenderer->uTargetGMask | pRenderer->uTargetBMask); |
444 | 444 |
445 auto pTex = pIcons_LOD->GetTexture(uTextureID_Leather); | 445 auto pTex = pIcons_LOD->GetTexture(uTextureID_Leather); |
446 pRenderer->_4A6A68(8, 352 - v0, pTex, pTex->uTextureHeight - v0); | 446 pRenderer->GetLeather(8, 352 - v0, pTex, pTex->uTextureHeight - v0); |
447 | 447 |
448 pRenderer->DrawTextureIndexed(8u, 347 - v0, pTexture_591428); | 448 pRenderer->DrawTextureIndexed(8u, 347 - v0, pTexture_591428); |
449 v1 = FitTextInAWindow(pGlobalTXT_LocalizationStrings[575], pFontArrus, &window, 0xDu, 0); | 449 v1 = FitTextInAWindow(pGlobalTXT_LocalizationStrings[575], pFontArrus, &window, 0xDu, 0); |
450 pDialogueWindow->DrawText(pFontArrus, 13, 354 - v0, 0, v1, 0, 0, 0); | 450 pDialogueWindow->DrawText(pFontArrus, 13, 354 - v0, 0, v1, 0, 0, 0); |
451 pRenderer->EndScene(); | 451 pRenderer->EndScene(); |