Mercurial > mm7
comparison UIBooks.cpp @ 710:735dab8d3c9a
Town portal screen + misc gui const replacements
author | Nomad |
---|---|
date | Thu, 21 Mar 2013 20:30:17 +0200 |
parents | af08fc9e29c8 |
children | e7c86528a2b3 |
comparison
equal
deleted
inserted
replaced
709:af08fc9e29c8 | 710:735dab8d3c9a |
---|---|
232 else | 232 else |
233 { | 233 { |
234 v23 = dword_506408[v4]; | 234 v23 = dword_506408[v4]; |
235 v6 = v5; | 235 v6 = v5; |
236 } | 236 } |
237 if ( v6->pLevelOfDetail0 ) | 237 if ( v6->pLevelOfDetail0_prolly_alpha_mask ) |
238 { | 238 { |
239 v7 = v0->lastOpenedSpellbookPage; | 239 v7 = v0->lastOpenedSpellbookPage; |
240 // v7 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v4]); | 240 // v7 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v4]); |
241 v19 = pViewport->uViewportTL_Y + pIconPos[v7][pSpellbookSpellIndices[v7][v4]].Ypos; | 241 v19 = pViewport->uViewportTL_Y + pIconPos[v7][pSpellbookSpellIndices[v7][v4]].Ypos; |
242 v17 = pViewport->uViewportTL_X + pIconPos[v7][pSpellbookSpellIndices[v7][v4]].Xpos; | 242 v17 = pViewport->uViewportTL_X + pIconPos[v7][pSpellbookSpellIndices[v7][v4]].Xpos; |
243 if ( BYTE1(v6->pBits) & 2 ) | 243 if ( BYTE1(v6->pBits) & 2 ) |
244 pRenderer->DrawTextureTransparent(v17, v19, v6); | 244 pRenderer->DrawTextureTransparent(v17, v19, v6); |
245 else | 245 else |
246 pRenderer->DrawTextureIndexed(v17, v19, v6); | 246 pRenderer->DrawTextureIndexed(v17, v19, v6); |
247 pRenderer->_4A612A(pIconPos[v7][pSpellbookSpellIndices[v7][v4]].Xpos, | 247 pRenderer->DrawMaskToZBuffer(pIconPos[v7][pSpellbookSpellIndices[v7][v4]].Xpos, |
248 pIconPos[v7][pSpellbookSpellIndices[v7][v4]].Ypos, v23, v4); | 248 pIconPos[v7][pSpellbookSpellIndices[v7][v4]].Ypos, v23, v4); |
249 } | 249 } |
250 } | 250 } |
251 } | 251 } |
252 ++v4; | 252 ++v4; |
256 v9 = pMouse->GetCursorPos(&a2); | 256 v9 = pMouse->GetCursorPos(&a2); |
257 v10 = pRenderer->pActiveZBuffer[v9->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v24)->y]] & 0xFFFF; | 257 v10 = pRenderer->pActiveZBuffer[v9->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v24)->y]] & 0xFFFF; |
258 if ( v10 ) | 258 if ( v10 ) |
259 { | 259 { |
260 v11 = dword_5063D8[v10]; | 260 v11 = dword_5063D8[v10]; |
261 if ( v11->pLevelOfDetail0 ) | 261 if ( v11->pLevelOfDetail0_prolly_alpha_mask ) |
262 { | 262 { |
263 v21 = dword_5063D8[v10]; | 263 v21 = dword_5063D8[v10]; |
264 v12 = v0->lastOpenedSpellbookPage; | 264 v12 = v0->lastOpenedSpellbookPage; |
265 // v12 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v10]); | 265 // v12 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v10]); |
266 v20 = pViewport->uViewportTL_Y + pIconPos[v12][pSpellbookSpellIndices[v12][v10]].Ypos; | 266 v20 = pViewport->uViewportTL_Y + pIconPos[v12][pSpellbookSpellIndices[v12][v10]].Ypos; |
1155 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor) | 1155 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor) |
1156 { | 1156 { |
1157 screenWidth = br_x - tl_x + 1; | 1157 screenWidth = br_x - tl_x + 1; |
1158 screenHeight = br_y - tl_y + 1; | 1158 screenHeight = br_y - tl_y + 1; |
1159 render16_data = &pRenderer->pTargetSurface[tl_x + tl_y * surfPitch]; | 1159 render16_data = &pRenderer->pTargetSurface[tl_x + tl_y * surfPitch]; |
1160 texture8_data = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].pLevelOfDetail0; | 1160 texture8_data = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].pLevelOfDetail0_prolly_alpha_mask; |
1161 pPalette_16 = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].pPalette16; | 1161 pPalette_16 = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].pPalette16; |
1162 scale_increment = (1 << (pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2 + 16)) / v5; | 1162 scale_increment = (1 << (pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2 + 16)) / v5; |
1163 | 1163 |
1164 v30 = (double)(1 << (16 - pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2)); | 1164 v30 = (double)(1 << (16 - pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2)); |
1165 | 1165 |