Mercurial > mm7

comparison UI/UiGame.cpp @ 1822:5f9eeb7bf8e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Finishing Player.cpp, fixing some bugs
author Grumpy7
date Wed, 09 Oct 2013 08:06:26 +0200
parents 4dee76d79c78
children 24b70fa98474
comparison
equal deleted inserted replaced
1821:49a4db499c0a 1822:5f9eeb7bf8e6
1718 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1718 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1719 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1719 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1720 else 1720 else
1721 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1721 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1722 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime 1722 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1723 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1723 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_SHIELD].uExpireTime
1724 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime ) 1724 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1725 sub_441A4E(i); 1725 sub_441A4E(i);
1726 continue; 1726 continue;
1727 } 1727 }
1728 if (pPlayer->IsDead()) 1728 if (pPlayer->IsDead())
1731 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1731 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1732 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1732 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1733 else 1733 else
1734 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1734 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1735 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime 1735 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1736 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1736 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_SHIELD].uExpireTime
1737 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime ) 1737 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1738 sub_441A4E(i); 1738 sub_441A4E(i);
1739 continue; 1739 continue;
1740 } 1740 }
1741 face_expression_ID = 0; 1741 face_expression_ID = 0;
1758 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1758 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1759 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1759 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1760 else 1760 else
1761 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1761 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1762 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime 1762 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1763 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1763 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_SHIELD].uExpireTime
1764 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime ) 1764 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1765 sub_441A4E(i); 1765 sub_441A4E(i);
1766 continue; 1766 continue;
1767 } 1767 }
1768 } 1768 }