Mercurial > mm7
comparison UiGame.cpp @ 855:cb0b3badc7f7
Слияние
author | Ritor1 |
---|---|
date | Sun, 31 Mar 2013 16:44:01 +0600 |
parents | ceef50611567 |
children | 54f191fc5e1e |
comparison
equal
deleted
inserted
replaced
854:06fc66ceecd6 | 855:cb0b3badc7f7 |
---|---|
1418 else | 1418 else |
1419 { | 1419 { |
1420 if ( pParty->uFlags & 0x20 ) | 1420 if ( pParty->uFlags & 0x20 ) |
1421 v16 = dword_5079C8; | 1421 v16 = dword_5079C8; |
1422 } | 1422 } |
1423 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[pElem->uPackedID >> 3] - 4, | 1423 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[PID_ID(pElem->uPackedID)] - 4, |
1424 0x181u, (Texture *)(v16 != -1 ? &pIcons_LOD->pTextures[v16] : 0)); | 1424 0x181u, (Texture *)(v16 != -1 ? &pIcons_LOD->pTextures[v16] : 0)); |
1425 } | 1425 } |
1426 } | 1426 } |
1427 } | 1427 } |
1428 } | 1428 } |