Mercurial > mm7
diff GUI/UI/UICharacter.cpp @ 2575:a76d408c5132 tip
DrawTranslucent -> DrawTextureGrayShade
Removed old texture drawing stuff
author | a.parshin |
---|---|
date | Wed, 09 Mar 2016 01:39:52 +0200 |
parents | dd36326a9994 |
children |
line wrap: on
line diff
--- a/GUI/UI/UICharacter.cpp Mon Mar 07 03:48:40 2016 +0200 +++ b/GUI/UI/UICharacter.cpp Wed Mar 09 01:39:52 2016 +0200 @@ -533,10 +533,11 @@ CharacterUI_ReleaseButtons(); ReleaseAwardsScrollBar(); CharacterUI_StatsTab_Draw(player); - pRenderer->DrawTextureTransparentColorKey( - pCharacterScreen_StatsBtn->uX, - pCharacterScreen_StatsBtn->uY, - pIcons_LOD->LoadTexturePtr("ib-cd1-d", TEXTURE_16BIT_PALETTE) + pRenderer->DrawTextureAlphaNew( + pCharacterScreen_StatsBtn->uX/640.0f, + pCharacterScreen_StatsBtn->uY/480.0f, + //pIcons_LOD->LoadTexturePtr("ib-cd1-d", TEXTURE_16BIT_PALETTE) + assets->GetImage_16BitColorKey("ib-cd1-d", 0x7FF) ); } break; @@ -550,10 +551,11 @@ } ReleaseAwardsScrollBar(); CharacterUI_SkillsTab_Draw(player); - pRenderer->DrawTextureTransparentColorKey( - pCharacterScreen_SkillsBtn->uX, - pCharacterScreen_SkillsBtn->uY, - pIcons_LOD->LoadTexturePtr("ib-cd2-d", TEXTURE_16BIT_PALETTE) + pRenderer->DrawTextureAlphaNew( + pCharacterScreen_SkillsBtn->uX/640.0f, + pCharacterScreen_SkillsBtn->uY/480.0f, + //pIcons_LOD->LoadTexturePtr("ib-cd2-d", TEXTURE_16BIT_PALETTE) + assets->GetImage_16BitColorKey("ib-cd2-d", 0x7FF) ); } break; @@ -564,10 +566,11 @@ ReleaseAwardsScrollBar(); CreateAwardsScrollBar(); CharacterUI_AwardsTab_Draw(player); - pRenderer->DrawTextureTransparentColorKey( - pCharacterScreen_AwardsBtn->uX, - pCharacterScreen_AwardsBtn->uY, - pIcons_LOD->LoadTexturePtr("ib-cd4-d", TEXTURE_16BIT_PALETTE) + pRenderer->DrawTextureAlphaNew( + pCharacterScreen_AwardsBtn->uX/640.0f, + pCharacterScreen_AwardsBtn->uY/480.0f, + //pIcons_LOD->LoadTexturePtr("ib-cd4-d", TEXTURE_16BIT_PALETTE) + assets->GetImage_16BitColorKey("ib-cd4-d", 0x7FF) ); } break; @@ -577,10 +580,11 @@ CharacterUI_ReleaseButtons(); ReleaseAwardsScrollBar(); CharacterUI_InventoryTab_Draw(player, false); - pRenderer->DrawTextureTransparentColorKey( - pCharacterScreen_InventoryBtn->uX, - pCharacterScreen_InventoryBtn->uY, - pIcons_LOD->LoadTexturePtr("ib-cd3-d", TEXTURE_16BIT_PALETTE) + pRenderer->DrawTextureAlphaNew( + pCharacterScreen_InventoryBtn->uX/640.0f, + pCharacterScreen_InventoryBtn->uY/480.0f, + //pIcons_LOD->LoadTexturePtr("ib-cd3-d", TEXTURE_16BIT_PALETTE) + assets->GetImage_16BitColorKey("ib-cd3-d", 0x7FF) ); } break;