Mercurial > mm7

comparison UI/UICharacter.cpp @ 1648:a4390cef284c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DamagePlayerFromMonster starting cleanup
author Grumpy7
date Tue, 17 Sep 2013 07:30:41 +0200
parents 511cd6dd1048
children b0a2b8525483
comparison
equal deleted inserted replaced
1647:511cd6dd1048 1648:a4390cef284c
941 if ( pPlayers[uPlayerID]->pEquipment.uArmor ) 941 if ( pPlayers[uPlayerID]->pEquipment.uArmor )
942 { 942 {
943 item = &pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uArmor - 1]; 943 item = &pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uArmor - 1];
944 switch ( item->uItemID ) 944 switch ( item->uItemID )
945 { 945 {
946 case ITEM_ARTICACT_GOVERNONS_ARMOR: 946 case ITEM_ARTIFACT_GOVERNORS_ARMOR:
947 index = 15; 947 index = 15;
948 break; 948 break;
949 case ITEM_ARTIFACT_YORUBA: 949 case ITEM_ARTIFACT_YORUBA:
950 index = 14; 950 index = 14;
951 break; 951 break;
1139 } 1139 }
1140 //--------------------------------(Shoulder/Ολεχθ)--------------------------------------------- 1140 //--------------------------------(Shoulder/Ολεχθ)---------------------------------------------
1141 item = &pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uArmor - 1]; 1141 item = &pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uArmor - 1];
1142 switch ( item->uItemID ) 1142 switch ( item->uItemID )
1143 { 1143 {
1144 case ITEM_ARTICACT_GOVERNONS_ARMOR: 1144 case ITEM_ARTIFACT_GOVERNORS_ARMOR:
1145 index = 15; 1145 index = 15;
1146 break; 1146 break;
1147 case ITEM_ARTIFACT_YORUBA: 1147 case ITEM_ARTIFACT_YORUBA:
1148 index = 14; 1148 index = 14;
1149 break; 1149 break;
1765 memset(byte_5111F6.data(), 0, sizeof(byte_5111F6)); 1765 memset(byte_5111F6.data(), 0, sizeof(byte_5111F6));
1766 for (uint i = 0; i < 4; ++i) 1766 for (uint i = 0; i < 4; ++i)
1767 { 1767 {
1768 auto player = pParty->pPlayers + i; 1768 auto player = pParty->pPlayers + i;
1769 1769
1770 if (player->HasItem(ITEM_ARTICACT_GOVERNONS_ARMOR, 1)) byte_5111F6[0] = 1; 1770 if (player->HasItem(ITEM_ARTIFACT_GOVERNORS_ARMOR, 1)) byte_5111F6[0] = 1;
1771 if (player->HasItem(ITEM_ARTIFACT_YORUBA, 1)) byte_5111F6[1] = 1; 1771 if (player->HasItem(ITEM_ARTIFACT_YORUBA, 1)) byte_5111F6[1] = 1;
1772 if (player->HasItem(ITEM_RELIC_HARECS_LEATHER, 1)) byte_5111F6[2] = 1; 1772 if (player->HasItem(ITEM_RELIC_HARECS_LEATHER, 1)) byte_5111F6[2] = 1;
1773 if (player->HasItem(ITEM_ARTIFACT_LEAGUE_BOOTS, 1)) byte_5111F6[3] = 1; 1773 if (player->HasItem(ITEM_ARTIFACT_LEAGUE_BOOTS, 1)) byte_5111F6[3] = 1;
1774 if (player->HasItem(ITEM_RELIC_TALEDONS_HELM, 1)) byte_5111F6[4] = 1; 1774 if (player->HasItem(ITEM_RELIC_TALEDONS_HELM, 1)) byte_5111F6[4] = 1;
1775 if (player->HasItem(ITEM_RELIC_SCHOLARS_CAP, 1)) byte_5111F6[5] = 1; 1775 if (player->HasItem(ITEM_RELIC_SCHOLARS_CAP, 1)) byte_5111F6[5] = 1;