Mercurial > mm7

comparison GUI/UI/UICharacter.cpp @ 2575:a76d408c5132 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DrawTranslucent -> DrawTextureGrayShade Removed old texture drawing stuff
author a.parshin
date Wed, 09 Mar 2016 01:39:52 +0200
parents dd36326a9994
children
comparison
equal deleted inserted replaced
2574:dd36326a9994 2575:a76d408c5132
531 case WINDOW_CharacterWindow_Stats: 531 case WINDOW_CharacterWindow_Stats:
532 { 532 {
533 CharacterUI_ReleaseButtons(); 533 CharacterUI_ReleaseButtons();
534 ReleaseAwardsScrollBar(); 534 ReleaseAwardsScrollBar();
535 CharacterUI_StatsTab_Draw(player); 535 CharacterUI_StatsTab_Draw(player);
536 pRenderer->DrawTextureTransparentColorKey( 536 pRenderer->DrawTextureAlphaNew(
537 pCharacterScreen_StatsBtn->uX, 537 pCharacterScreen_StatsBtn->uX/640.0f,
538 pCharacterScreen_StatsBtn->uY, 538 pCharacterScreen_StatsBtn->uY/480.0f,
539 pIcons_LOD->LoadTexturePtr("ib-cd1-d", TEXTURE_16BIT_PALETTE) 539 //pIcons_LOD->LoadTexturePtr("ib-cd1-d", TEXTURE_16BIT_PALETTE)
540 assets->GetImage_16BitColorKey("ib-cd1-d", 0x7FF)
540 ); 541 );
541 } 542 }
542 break; 543 break;
543 544
544 case WINDOW_CharacterWindow_Skills: 545 case WINDOW_CharacterWindow_Skills:
548 CharacterUI_ReleaseButtons(); 549 CharacterUI_ReleaseButtons();
549 CharacterUI_SkillsTab_CreateButtons(); 550 CharacterUI_SkillsTab_CreateButtons();
550 } 551 }
551 ReleaseAwardsScrollBar(); 552 ReleaseAwardsScrollBar();
552 CharacterUI_SkillsTab_Draw(player); 553 CharacterUI_SkillsTab_Draw(player);
553 pRenderer->DrawTextureTransparentColorKey( 554 pRenderer->DrawTextureAlphaNew(
554 pCharacterScreen_SkillsBtn->uX, 555 pCharacterScreen_SkillsBtn->uX/640.0f,
555 pCharacterScreen_SkillsBtn->uY, 556 pCharacterScreen_SkillsBtn->uY/480.0f,
556 pIcons_LOD->LoadTexturePtr("ib-cd2-d", TEXTURE_16BIT_PALETTE) 557 //pIcons_LOD->LoadTexturePtr("ib-cd2-d", TEXTURE_16BIT_PALETTE)
558 assets->GetImage_16BitColorKey("ib-cd2-d", 0x7FF)
557 ); 559 );
558 } 560 }
559 break; 561 break;
560 562
561 case WINDOW_CharacterWindow_Awards: 563 case WINDOW_CharacterWindow_Awards:
562 { 564 {
563 CharacterUI_ReleaseButtons(); 565 CharacterUI_ReleaseButtons();
564 ReleaseAwardsScrollBar(); 566 ReleaseAwardsScrollBar();
565 CreateAwardsScrollBar(); 567 CreateAwardsScrollBar();
566 CharacterUI_AwardsTab_Draw(player); 568 CharacterUI_AwardsTab_Draw(player);
567 pRenderer->DrawTextureTransparentColorKey( 569 pRenderer->DrawTextureAlphaNew(
568 pCharacterScreen_AwardsBtn->uX, 570 pCharacterScreen_AwardsBtn->uX/640.0f,
569 pCharacterScreen_AwardsBtn->uY, 571 pCharacterScreen_AwardsBtn->uY/480.0f,
570 pIcons_LOD->LoadTexturePtr("ib-cd4-d", TEXTURE_16BIT_PALETTE) 572 //pIcons_LOD->LoadTexturePtr("ib-cd4-d", TEXTURE_16BIT_PALETTE)
573 assets->GetImage_16BitColorKey("ib-cd4-d", 0x7FF)
571 ); 574 );
572 } 575 }
573 break; 576 break;
574 577
575 case WINDOW_CharacterWindow_Inventory: 578 case WINDOW_CharacterWindow_Inventory:
576 { 579 {
577 CharacterUI_ReleaseButtons(); 580 CharacterUI_ReleaseButtons();
578 ReleaseAwardsScrollBar(); 581 ReleaseAwardsScrollBar();
579 CharacterUI_InventoryTab_Draw(player, false); 582 CharacterUI_InventoryTab_Draw(player, false);
580 pRenderer->DrawTextureTransparentColorKey( 583 pRenderer->DrawTextureAlphaNew(
581 pCharacterScreen_InventoryBtn->uX, 584 pCharacterScreen_InventoryBtn->uX/640.0f,
582 pCharacterScreen_InventoryBtn->uY, 585 pCharacterScreen_InventoryBtn->uY/480.0f,
583 pIcons_LOD->LoadTexturePtr("ib-cd3-d", TEXTURE_16BIT_PALETTE) 586 //pIcons_LOD->LoadTexturePtr("ib-cd3-d", TEXTURE_16BIT_PALETTE)
587 assets->GetImage_16BitColorKey("ib-cd3-d", 0x7FF)
584 ); 588 );
585 } 589 }
586 break; 590 break;
587 591
588 default: __debugbreak(); break; 592 default: __debugbreak(); break;