Mercurial > mm7
diff GUI/UI/UICharacter.cpp @ 2572:d87bfbd3bb3b
Step towards unification of Texture and RGBTexture (class Image)
| author | a.parshin |
|---|---|
| date | Sat, 05 Mar 2016 01:51:54 +0200 |
| parents | d569340b05ff |
| children | 0c67be4ec900 |
line wrap: on
line diff
--- a/GUI/UI/UICharacter.cpp Mon Oct 05 00:19:13 2015 +0200 +++ b/GUI/UI/UICharacter.cpp Sat Mar 05 01:51:54 2016 +0200 @@ -1608,7 +1608,7 @@ } if ( !bRingsShownInCharScreen )//рисование лупы pRenderer->DrawTextureIndexedAlpha(603, 299, pIcons_LOD->GetTexture(uTextureID_MAGNIF_B)); - pRenderer->DrawTextureIndexedAlpha(468, 0, pIcons_LOD->GetTexture(uTextureID_right_panel_loop));//обрамление + pRenderer->DrawTextureIndexedAlpha(468, 0, right_panel_loop);//обрамление } //----- (0041A2D1) -------------------------------------------------------- @@ -1723,7 +1723,7 @@ { CharacterUI_DrawPaperdoll(player); pRenderer->DrawTextureIndexedAlpha(0x1D9u, 0, pIcons_LOD->GetTexture(uTextureID_BACKHAND)); - pRenderer->DrawTextureIndexedAlpha(0x1D4u, 0, pIcons_LOD->GetTexture(uTextureID_right_panel_loop)); + pRenderer->DrawTextureIndexedAlpha(0x1D4u, 0, right_panel_loop); pRenderer->DrawTextureIndexed(pCharacterScreen_DetalizBtn->uX, pCharacterScreen_DetalizBtn->uY, pIcons_LOD->GetTexture(uTextureID_detaliz_close_button)); for (uint i = 0; i < 6; ++i) @@ -1755,7 +1755,7 @@ uTextureID_MAGNIF_B = pIcons_LOD->LoadTexture("MAGNIF-B", TEXTURE_16BIT_PALETTE); //if ( !pParty->uAlignment || pParty->uAlignment == 1 || pParty->uAlignment == 2 ) uTextureID_BACKDOLL = pIcons_LOD->LoadTexture("BACKDOLL", TEXTURE_16BIT_PALETTE); - uTextureID_right_panel_loop = uTextureID_right_panel; + right_panel_loop = right_panel; uTextureID_BACKHAND = pIcons_LOD->LoadTexture("BACKHAND", TEXTURE_16BIT_PALETTE); uTextureID_detaliz_close_button = uExitCancelTextureId; for ( uint i = 0; i < 4; ++i )