Mercurial > mm7

comparison GUI/UI/Spellbook.cpp @ 2573:0c67be4ec900

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DrawTextureIndexed renamed to DrawTextureTransparentColorKey Changing more class Texture to class Image.
author a.parshin
date Sat, 05 Mar 2016 16:25:53 +0200
parents d87bfbd3bb3b
children dd36326a9994
comparison
equal deleted inserted replaced
2572:d87bfbd3bb3b 2573:0c67be4ec900
173 pX_coord = pViewport->uViewportTL_X + pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][i]].Xpos; 173 pX_coord = pViewport->uViewportTL_X + pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][i]].Xpos;
174 pY_coord = pViewport->uViewportTL_Y + pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][i]].Ypos; 174 pY_coord = pViewport->uViewportTL_Y + pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][i]].Ypos;
175 if (pTexture->pBits & 0x200) 175 if (pTexture->pBits & 0x200)
176 pRenderer->DrawTextureIndexedAlpha(pX_coord, pY_coord, pTexture); 176 pRenderer->DrawTextureIndexedAlpha(pX_coord, pY_coord, pTexture);
177 else 177 else
178 pRenderer->DrawTextureIndexed(pX_coord, pY_coord, pTexture); 178 pRenderer->DrawTextureTransparentColorKey(pX_coord, pY_coord, pTexture);
179 pRenderer->DrawMaskToZBuffer(pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][i]].Xpos, 179 pRenderer->DrawMaskToZBuffer(pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][i]].Xpos,
180 pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][i]].Ypos, pTexture, i); 180 pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][i]].Ypos, pTexture, i);
181 } 181 }
182 } 182 }
183 } 183 }
193 pX_coord = pViewport->uViewportTL_X + pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][v10]].Xpos; 193 pX_coord = pViewport->uViewportTL_X + pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][v10]].Xpos;
194 pY_coord = pViewport->uViewportTL_Y + pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][v10]].Ypos; 194 pY_coord = pViewport->uViewportTL_Y + pIconPos[player->lastOpenedSpellbookPage][pSpellbookSpellIndices[player->lastOpenedSpellbookPage][v10]].Ypos;
195 if (SBPageCSpellsTextureList[v10]->pBits & 0x200) 195 if (SBPageCSpellsTextureList[v10]->pBits & 0x200)
196 pRenderer->DrawTextureIndexedAlpha(pX_coord, pY_coord, SBPageCSpellsTextureList[v10]); 196 pRenderer->DrawTextureIndexedAlpha(pX_coord, pY_coord, SBPageCSpellsTextureList[v10]);
197 else 197 else
198 pRenderer->DrawTextureIndexed(pX_coord, pY_coord, SBPageCSpellsTextureList[v10]); 198 pRenderer->DrawTextureTransparentColorKey(pX_coord, pY_coord, SBPageCSpellsTextureList[v10]);
199 } 199 }
200 } 200 }
201 //pX_coord = (unsigned int)&player->pActiveSkills[PLAYER_SKILL_FIRE]; 201 //pX_coord = (unsigned int)&player->pActiveSkills[PLAYER_SKILL_FIRE];
202 //pY_coord = (unsigned int)&player->pActiveSkills[PLAYER_SKILL_FIRE]; 202 //pY_coord = (unsigned int)&player->pActiveSkills[PLAYER_SKILL_FIRE];
203 for (uint i = 0; i < 9; i++) 203 for (uint i = 0; i < 9; i++)
261 static void BookUI_Spellbook_DrawCurrentSchoolBackground() 261 static void BookUI_Spellbook_DrawCurrentSchoolBackground()
262 { 262 {
263 int pTexID = 0; 263 int pTexID = 0;
264 if ( uActiveCharacter ) 264 if ( uActiveCharacter )
265 pTexID = pParty->pPlayers[uActiveCharacter - 1].lastOpenedSpellbookPage; 265 pTexID = pParty->pPlayers[uActiveCharacter - 1].lastOpenedSpellbookPage;
266 pRenderer->DrawTextureIndexed(8, 8, pSpellBookPagesTextr[pTexID]); 266 pRenderer->DrawTextureTransparentColorKey(8, 8, pSpellBookPagesTextr[pTexID]);
267 pRenderer->DrawTextureIndexed(476, 450, pSBQuickSpellBtnTextr); 267 pRenderer->DrawTextureTransparentColorKey(476, 450, pSBQuickSpellBtnTextr);
268 pRenderer->DrawTextureIndexed(561, 450, pSpellBookCloseBtnTextr); 268 pRenderer->DrawTextureTransparentColorKey(561, 450, pSpellBookCloseBtnTextr);
269 } 269 }
270 270
271 271
272 272
273 273