Mercurial > mm7

comparison UI/UiGame.cpp @ 1613:aaefada3e1d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 15 Sep 2013 00:41:51 +0600
parents fa0e700bcc80 434b796cdfd3
children 07fe868f0b44
comparison
equal deleted inserted replaced
1612:11f12a34b397 1613:aaefada3e1d8
1740 pPortrait = pTexture_PlayerFaceEradicated; 1740 pPortrait = pTexture_PlayerFaceEradicated;
1741 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1741 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1742 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1742 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1743 else 1743 else
1744 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1744 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1745 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_7].uExpireTime 1745 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1746 | pPlayer->pPlayerBuffs[PLAYER_BUFF_8].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1746 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime
1747 | pPlayer->pPlayerBuffs[PLAYER_BUFF_14].uExpireTime ) 1747 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1748 sub_441A4E(i); 1748 sub_441A4E(i);
1749 continue; 1749 continue;
1750 } 1750 }
1751 if (pPlayer->IsDead()) 1751 if (pPlayer->IsDead())
1752 { 1752 {
1753 pPortrait = pTexture_PlayerFaceDead; 1753 pPortrait = pTexture_PlayerFaceDead;
1754 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1754 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1755 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1755 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1756 else 1756 else
1757 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1757 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1758 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_7].uExpireTime 1758 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1759 | pPlayer->pPlayerBuffs[PLAYER_BUFF_8].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1759 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime
1760 | pPlayer->pPlayerBuffs[PLAYER_BUFF_14].uExpireTime ) 1760 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1761 sub_441A4E(i); 1761 sub_441A4E(i);
1762 continue; 1762 continue;
1763 } 1763 }
1764 face_expression_ID = 0; 1764 face_expression_ID = 0;
1765 for ( uint j = 0; j < pPlayerFrameTable->uNumFrames; ++j ) 1765 for ( uint j = 0; j < pPlayerFrameTable->uNumFrames; ++j )
1780 pPortrait = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];//pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID]; 1780 pPortrait = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];//pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID];
1781 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1781 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1782 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1782 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1783 else 1783 else
1784 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1784 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1785 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_7].uExpireTime 1785 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1786 | pPlayer->pPlayerBuffs[PLAYER_BUFF_8].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1786 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime
1787 | pPlayer->pPlayerBuffs[PLAYER_BUFF_14].uExpireTime ) 1787 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1788 sub_441A4E(i); 1788 sub_441A4E(i);
1789 continue; 1789 continue;
1790 } 1790 }
1791 } 1791 }
1792 if ( pParty->bTurnBasedModeOn == 1 ) 1792 if ( pParty->bTurnBasedModeOn == 1 )