Mercurial > mm7

comparison GUI/UI/UICharacter.cpp @ 2572:d87bfbd3bb3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
2571:cf29f444ddd7 2572:d87bfbd3bb3b
1606 pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1], 1606 pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1],
1607 pIcons_LOD->GetTexture(papredoll_dlhus[uPlayerID - 1])); 1607 pIcons_LOD->GetTexture(papredoll_dlhus[uPlayerID - 1]));
1608 } 1608 }
1609 if ( !bRingsShownInCharScreen )//рисование лупы 1609 if ( !bRingsShownInCharScreen )//рисование лупы
1610 pRenderer->DrawTextureIndexedAlpha(603, 299, pIcons_LOD->GetTexture(uTextureID_MAGNIF_B)); 1610 pRenderer->DrawTextureIndexedAlpha(603, 299, pIcons_LOD->GetTexture(uTextureID_MAGNIF_B));
1611 pRenderer->DrawTextureIndexedAlpha(468, 0, pIcons_LOD->GetTexture(uTextureID_right_panel_loop));//обрамление 1611 pRenderer->DrawTextureIndexedAlpha(468, 0, right_panel_loop);//обрамление
1612 } 1612 }
1613 1613
1614 //----- (0041A2D1) -------------------------------------------------------- 1614 //----- (0041A2D1) --------------------------------------------------------
1615 void CharacterUI_InventoryTab_Draw(Player *player, bool a2) 1615 void CharacterUI_InventoryTab_Draw(Player *player, bool a2)
1616 { 1616 {
1721 //----- (0043E825) -------------------------------------------------------- 1721 //----- (0043E825) --------------------------------------------------------
1722 void CharacterUI_DrawPaperdollWithRingOverlay(Player *player) 1722 void CharacterUI_DrawPaperdollWithRingOverlay(Player *player)
1723 { 1723 {
1724 CharacterUI_DrawPaperdoll(player); 1724 CharacterUI_DrawPaperdoll(player);
1725 pRenderer->DrawTextureIndexedAlpha(0x1D9u, 0, pIcons_LOD->GetTexture(uTextureID_BACKHAND)); 1725 pRenderer->DrawTextureIndexedAlpha(0x1D9u, 0, pIcons_LOD->GetTexture(uTextureID_BACKHAND));
1726 pRenderer->DrawTextureIndexedAlpha(0x1D4u, 0, pIcons_LOD->GetTexture(uTextureID_right_panel_loop)); 1726 pRenderer->DrawTextureIndexedAlpha(0x1D4u, 0, right_panel_loop);
1727 pRenderer->DrawTextureIndexed(pCharacterScreen_DetalizBtn->uX, pCharacterScreen_DetalizBtn->uY, 1727 pRenderer->DrawTextureIndexed(pCharacterScreen_DetalizBtn->uX, pCharacterScreen_DetalizBtn->uY,
1728 pIcons_LOD->GetTexture(uTextureID_detaliz_close_button)); 1728 pIcons_LOD->GetTexture(uTextureID_detaliz_close_button));
1729 for (uint i = 0; i < 6; ++i) 1729 for (uint i = 0; i < 6; ++i)
1730 { 1730 {
1731 if (!player->pEquipment.uRings[i]) 1731 if (!player->pEquipment.uRings[i])
1753 char pContainer[128]; // [sp+24h] [bp-14h]@12 1753 char pContainer[128]; // [sp+24h] [bp-14h]@12
1754 1754
1755 uTextureID_MAGNIF_B = pIcons_LOD->LoadTexture("MAGNIF-B", TEXTURE_16BIT_PALETTE); 1755 uTextureID_MAGNIF_B = pIcons_LOD->LoadTexture("MAGNIF-B", TEXTURE_16BIT_PALETTE);
1756 //if ( !pParty->uAlignment || pParty->uAlignment == 1 || pParty->uAlignment == 2 ) 1756 //if ( !pParty->uAlignment || pParty->uAlignment == 1 || pParty->uAlignment == 2 )
1757 uTextureID_BACKDOLL = pIcons_LOD->LoadTexture("BACKDOLL", TEXTURE_16BIT_PALETTE); 1757 uTextureID_BACKDOLL = pIcons_LOD->LoadTexture("BACKDOLL", TEXTURE_16BIT_PALETTE);
1758 uTextureID_right_panel_loop = uTextureID_right_panel; 1758 right_panel_loop = right_panel;
1759 uTextureID_BACKHAND = pIcons_LOD->LoadTexture("BACKHAND", TEXTURE_16BIT_PALETTE); 1759 uTextureID_BACKHAND = pIcons_LOD->LoadTexture("BACKHAND", TEXTURE_16BIT_PALETTE);
1760 uTextureID_detaliz_close_button = uExitCancelTextureId; 1760 uTextureID_detaliz_close_button = uExitCancelTextureId;
1761 for ( uint i = 0; i < 4; ++i ) 1761 for ( uint i = 0; i < 4; ++i )
1762 { 1762 {
1763 if ( pPlayers[i + 1]->HasUnderwaterSuitEquipped() ) 1763 if ( pPlayers[i + 1]->HasUnderwaterSuitEquipped() )