Mercurial > mm7
comparison UI/UICharacter.cpp @ 1525:863de6ec906b
Слияние
author | Ritor1 |
---|---|
date | Thu, 05 Sep 2013 13:31:15 +0600 |
parents | 091c5eb46a0e |
children | c4ab816fcc5e |
comparison
equal
deleted
inserted
replaced
1524:58d15177edd0 | 1525:863de6ec906b |
---|---|
1762 if ( Player_has_item(i + 66, &pParty->pPlayers[j], 0) ) | 1762 if ( Player_has_item(i + 66, &pParty->pPlayers[j], 0) ) |
1763 party_has_equipment[i] = 1; | 1763 party_has_equipment[i] = 1; |
1764 } | 1764 } |
1765 } | 1765 } |
1766 } | 1766 } |
1767 memset(byte_5111F6.data(), 0, 16); | 1767 memset(byte_5111F6.data(), 0, sizeof(byte_5111F6)); |
1768 for (uint i = 0; i < 4; ++i) | 1768 for (uint i = 0; i < 4; ++i) |
1769 { | 1769 { |
1770 auto player = pParty->pPlayers + i; | 1770 auto player = pParty->pPlayers + i; |
1771 | 1771 |
1772 if (Player_has_item(ITEM_ARTICACT_GOVERNONS_ARMOR, player, 1)) byte_5111F6[0] = 1; | 1772 if (Player_has_item(ITEM_ARTICACT_GOVERNONS_ARMOR, player, 1)) byte_5111F6[0] = 1; |