Mercurial > mm7
comparison UI/Books/UIMapBook.cpp @ 2275:8193a64c7461
Слияние
author | Ritor1 |
---|---|
date | Fri, 14 Mar 2014 09:32:42 +0600 |
parents | 43a508455445 |
children | ddb803517a48 |
comparison
equal
deleted
inserted
replaced
2274:90f56da08d76 | 2275:8193a64c7461 |
---|---|
135 //if ( pSavegameThumbnails[BeaconID].pPixels != 0 ) | 135 //if ( pSavegameThumbnails[BeaconID].pPixels != 0 ) |
136 if ( pPlayer->pInstalledBeacons[BeaconID].SaveFileID != 0 ) | 136 if ( pPlayer->pInstalledBeacons[BeaconID].SaveFileID != 0 ) |
137 { | 137 { |
138 pRenderer->DrawTextureTransparent(pLloydsBeacons_SomeXs[BeaconID], pLloydsBeacons_SomeYs[BeaconID], pTexture_CurrentBook); | 138 pRenderer->DrawTextureTransparent(pLloydsBeacons_SomeXs[BeaconID], pLloydsBeacons_SomeYs[BeaconID], pTexture_CurrentBook); |
139 pRenderer->DrawTextureRGB(pLloydsBeaconsPreviewXs[BeaconID], pLloydsBeaconsPreviewYs[BeaconID], &pSavegameThumbnails[BeaconID]); | 139 pRenderer->DrawTextureRGB(pLloydsBeaconsPreviewXs[BeaconID], pLloydsBeaconsPreviewYs[BeaconID], &pSavegameThumbnails[BeaconID]); |
140 Str = pMapStats->pInfos[sub_410D99_get_map_index(pPlayer->pInstalledBeacons[BeaconID].SaveFileID)].pName; | 140 Str = pMapStats->pInfos[pMapStats->sub_410D99_get_map_index(pPlayer->pInstalledBeacons[BeaconID].SaveFileID)].pName; |
141 pTextHeight = pSpellFont->CalcTextHeight(Str, &pWindow, 0, 0); | 141 pTextHeight = pSpellFont->CalcTextHeight(Str, &pWindow, 0, 0); |
142 pWindow.uFrameY += -6 - pTextHeight; | 142 pWindow.uFrameY += -6 - pTextHeight; |
143 pWindow.DrawTitleText(pSpellFont, 0, 0, 1, Str, 3); | 143 pWindow.DrawTitleText(pSpellFont, 0, 0, 1, Str, 3); |
144 RemainingTime = pPlayer->pInstalledBeacons[BeaconID].uBeaconTime - pParty->uTimePlayed; | 144 RemainingTime = pPlayer->pInstalledBeacons[BeaconID].uBeaconTime - pParty->uTimePlayed; |
145 pHours = (signed __int64)((double)RemainingTime * 0.234375) / 60 / 60; | 145 pHours = (signed __int64)((double)RemainingTime * 0.234375) / 60 / 60; |