Mercurial > mm7
changeset 1082:7033eb155558
bugfix
| author | Gloval |
|---|---|
| date | Sun, 26 May 2013 00:03:16 +0400 |
| parents | 6ea7c693a1cf |
| children | ddf53a2d0bf5 5a59b5b2699f 9c7eb4037567 |
| files | Items.cpp Items.h Player.cpp |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Items.cpp Sat May 25 23:51:56 2013 +0400 +++ b/Items.cpp Sun May 26 00:03:16 2013 +0400 @@ -306,6 +306,7 @@ pItemsTXT_Raw = NULL; } + //----- (00456D84) -------------------------------------------------------- void ItemsTable::Initialize() {
--- a/Items.h Sat May 25 23:51:56 2013 +0400 +++ b/Items.h Sun May 26 00:03:16 2013 +0400 @@ -117,8 +117,8 @@ EQUIP_HELMET = 5, EQUIP_BELT = 6, EQUIP_CLOAK = 7, - EQUIP_BOOTS = 8, - EQUIP_GAUNTLETS = 9, + EQUIP_GAUNTLETS = 8, + EQUIP_BOOTS = 9, EQUIP_RING = 10, EQUIP_AMULET = 11, EQUIP_WAND = 12,
--- a/Player.cpp Sat May 25 23:51:56 2013 +0400 +++ b/Player.cpp Sun May 26 00:03:16 2013 +0400 @@ -1101,7 +1101,7 @@ if ( a3 == 1 && (HasEnchantedItemEquipped(19) || WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) || - WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_BELT)) ) + WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_CLOAK)) ) return 0; PlaySound((PlayerSpeech)29, 0); @@ -1119,7 +1119,7 @@ } if ( HasEnchantedItemEquipped(21) || WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) - || WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_BELT) ) + || WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_CLOAK) ) //goto LABEL_76; return 0; } @@ -1143,7 +1143,7 @@ if ( HasEnchantedItemEquipped(18) || WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) || - WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_BELT) ) + WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_CLOAK) ) return 0; } PlaySound((PlayerSpeech)28, 0); @@ -1162,7 +1162,7 @@ if ( HasEnchantedItemEquipped(20)|| WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR)|| WearsItem(ITEM_ARTIFACT_GHOULSBANE, EQIUP_ANY)|| - WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_BELT)) + WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_CLOAK)) return 0; } break; @@ -1191,7 +1191,7 @@ || HasEnchantedItemEquipped(23)|| WearsItem(ITEM_RELIC_KELEBRIM, EQIUP_ANY) || WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) || - WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_BELT)) ) + WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_CLOAK)) ) return 0; PlaySound((PlayerSpeech)34, 0);