comparison GUI/UI/Books/LloydsBook.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 87e5590d034b
children 0c67be4ec900
comparison
equal deleted inserted replaced
2571:cf29f444ddd7 2572:d87bfbd3bb3b
130 pWindow.uFrameZ = pLloydsBeaconsPreviewXs[BeaconID] + 91; 130 pWindow.uFrameZ = pLloydsBeaconsPreviewXs[BeaconID] + 91;
131 //if ( pSavegameThumbnails[BeaconID].pPixels != 0 ) 131 //if ( pSavegameThumbnails[BeaconID].pPixels != 0 )
132 if (pPlayer->pInstalledBeacons[BeaconID].SaveFileID != 0) 132 if (pPlayer->pInstalledBeacons[BeaconID].SaveFileID != 0)
133 { 133 {
134 pRenderer->DrawTextureIndexedAlpha(pLloydsBeacons_SomeXs[BeaconID], pLloydsBeacons_SomeYs[BeaconID], pTexture_CurrentBook); 134 pRenderer->DrawTextureIndexedAlpha(pLloydsBeacons_SomeXs[BeaconID], pLloydsBeacons_SomeYs[BeaconID], pTexture_CurrentBook);
135 pRenderer->DrawTextureRGB(pLloydsBeaconsPreviewXs[BeaconID], pLloydsBeaconsPreviewYs[BeaconID], &pSavegameThumbnails[BeaconID]); 135 pRenderer->DrawTextureNew(pLloydsBeaconsPreviewXs[BeaconID]/640.0f, pLloydsBeaconsPreviewYs[BeaconID]/480.0f, pSavegameThumbnails[BeaconID]);
136 Str = pMapStats->pInfos[pMapStats->sub_410D99_get_map_index(pPlayer->pInstalledBeacons[BeaconID].SaveFileID)].pName; 136 Str = pMapStats->pInfos[pMapStats->sub_410D99_get_map_index(pPlayer->pInstalledBeacons[BeaconID].SaveFileID)].pName;
137 pTextHeight = pSpellFont->CalcTextHeight(Str, &pWindow, 0, 0); 137 pTextHeight = pSpellFont->CalcTextHeight(Str, &pWindow, 0, 0);
138 pWindow.uFrameY += -6 - pTextHeight; 138 pWindow.uFrameY += -6 - pTextHeight;
139 pWindow.DrawTitleText(pSpellFont, 0, 0, 1, Str, 3); 139 pWindow.DrawTitleText(pSpellFont, 0, 0, 1, Str, 3);
140 RemainingTime = pPlayer->pInstalledBeacons[BeaconID].uBeaconTime - pParty->uTimePlayed; 140 RemainingTime = pPlayer->pInstalledBeacons[BeaconID].uBeaconTime - pParty->uTimePlayed;