Mercurial > mm7
diff GUI/UI/Books/CalendarBook.cpp @ 2574:dd36326a9994
More texture refactoring
GetLeather -> DrawTextureCustomHeight
| author | a.parshin |
|---|---|
| date | Mon, 07 Mar 2016 03:48:40 +0200 |
| parents | 0c67be4ec900 |
| children |
line wrap: on
line diff
--- a/GUI/UI/Books/CalendarBook.cpp Sat Mar 05 16:25:53 2016 +0200 +++ b/GUI/UI/Books/CalendarBook.cpp Mon Mar 07 03:48:40 2016 +0200 @@ -13,6 +13,14 @@ +Image *ui_book_calendar_background = nullptr; + +Image *ui_book_calendar_moon_new = nullptr; +Image *ui_book_calendar_moon_4 = nullptr; +Image *ui_book_calendar_moon_2 = nullptr; +Image *ui_book_calendar_moon_2_2 = nullptr; +Image *ui_book_calendar_moon_full = nullptr; + GUIWindow_CalendarBook::GUIWindow_CalendarBook() : GUIWindow_Book() { @@ -27,12 +35,12 @@ // ---------------------------------------------- // 00411BFC GUIWindow::InitializeBookView -- part - pSpellBookPagesTextr_13 = pIcons_LOD->LoadTexturePtr("sbdate-time", TEXTURE_16BIT_PALETTE); - pTex_moon_new = pIcons_LOD->LoadTexturePtr("moon_new", TEXTURE_16BIT_PALETTE); - pTex_moon_4 = pIcons_LOD->LoadTexturePtr("moon_4", TEXTURE_16BIT_PALETTE); - pTex_moon_2 = pIcons_LOD->LoadTexturePtr("moon_2", TEXTURE_16BIT_PALETTE); - pTex_moon_2_2 = pIcons_LOD->LoadTexturePtr("moon_2", TEXTURE_16BIT_PALETTE); - pTex_moon_ful = pIcons_LOD->LoadTexturePtr("moon_ful", TEXTURE_16BIT_PALETTE); + ui_book_calendar_background = assets->GetImage_16BitColorKey(L"sbdate-time", 0x7FF); + ui_book_calendar_moon_new = assets->GetImage_16BitColorKey("moon_new", 0x7FF); + ui_book_calendar_moon_4 = assets->GetImage_16BitColorKey("moon_4", 0x7FF); + ui_book_calendar_moon_2 = assets->GetImage_16BitColorKey("moon_2", 0x7FF); + ui_book_calendar_moon_2_2 = assets->GetImage_16BitColorKey("moon_2", 0x7FF); + ui_book_calendar_moon_full = assets->GetImage_16BitColorKey("moon_ful", 0x7FF); } @@ -87,7 +95,7 @@ 1, 1, 1, 1 }; - pRenderer->DrawTextureTransparentColorKey(pViewport->uViewportTL_X, pViewport->uViewportTL_Y, pSpellBookPagesTextr_13); + pRenderer->DrawTextureAlphaNew(pViewport->uViewportTL_X/640.0f, pViewport->uViewportTL_Y/480.0f, ui_book_calendar_background); pHour = pParty->uCurrentHour; if ((signed int)pHour >= 12) {