Mercurial > mm7

comparison Player.cpp @ 1082:7033eb155558

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix
author Gloval
date Sun, 26 May 2013 00:03:16 +0400
parents 9456f2ed5ff9
children 9c7eb4037567
comparison
equal deleted inserted replaced
1081:6ea7c693a1cf 1082:7033eb155558
1099 1099
1100 case Condition_Insane: 1100 case Condition_Insane:
1101 if ( a3 == 1 1101 if ( a3 == 1
1102 && (HasEnchantedItemEquipped(19) || 1102 && (HasEnchantedItemEquipped(19) ||
1103 WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) || 1103 WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) ||
1104 WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_BELT)) ) 1104 WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_CLOAK)) )
1105 return 0; 1105 return 0;
1106 1106
1107 PlaySound((PlayerSpeech)29, 0); 1107 PlaySound((PlayerSpeech)29, 0);
1108 break; 1108 break;
1109 case Condition_Poison1: 1109 case Condition_Poison1:
1117 if ( pParty->pPartyBuffs[13].uPower < 1u ) 1117 if ( pParty->pPartyBuffs[13].uPower < 1u )
1118 pParty->pPartyBuffs[13].Reset(); 1118 pParty->pPartyBuffs[13].Reset();
1119 } 1119 }
1120 if ( HasEnchantedItemEquipped(21) 1120 if ( HasEnchantedItemEquipped(21)
1121 || WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) 1121 || WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR)
1122 || WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_BELT) ) 1122 || WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_CLOAK) )
1123 //goto LABEL_76; 1123 //goto LABEL_76;
1124 return 0; 1124 return 0;
1125 } 1125 }
1126 1126
1127 //v23 = 27; 1127 //v23 = 27;
1141 return 0; 1141 return 0;
1142 } 1142 }
1143 1143
1144 if ( HasEnchantedItemEquipped(18) || 1144 if ( HasEnchantedItemEquipped(18) ||
1145 WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) || 1145 WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) ||
1146 WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_BELT) ) 1146 WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_CLOAK) )
1147 return 0; 1147 return 0;
1148 } 1148 }
1149 PlaySound((PlayerSpeech)28, 0); 1149 PlaySound((PlayerSpeech)28, 0);
1150 break; 1150 break;
1151 case Condition_Paralyzed: 1151 case Condition_Paralyzed:
1160 } 1160 }
1161 1161
1162 if ( HasEnchantedItemEquipped(20)|| 1162 if ( HasEnchantedItemEquipped(20)||
1163 WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR)|| 1163 WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR)||
1164 WearsItem(ITEM_ARTIFACT_GHOULSBANE, EQIUP_ANY)|| 1164 WearsItem(ITEM_ARTIFACT_GHOULSBANE, EQIUP_ANY)||
1165 WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_BELT)) 1165 WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_CLOAK))
1166 return 0; 1166 return 0;
1167 } 1167 }
1168 break; 1168 break;
1169 case Condition_Unconcious: 1169 case Condition_Unconcious:
1170 PlaySound(SPEECH_32, 0); 1170 PlaySound(SPEECH_32, 0);
1189 if ( a3 == 1 1189 if ( a3 == 1
1190 &&((pParty->pPartyBuffs[13].uExpireTime > 0i64) 1190 &&((pParty->pPartyBuffs[13].uExpireTime > 0i64)
1191 || HasEnchantedItemEquipped(23)|| 1191 || HasEnchantedItemEquipped(23)||
1192 WearsItem(ITEM_RELIC_KELEBRIM, EQIUP_ANY) || 1192 WearsItem(ITEM_RELIC_KELEBRIM, EQIUP_ANY) ||
1193 WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) || 1193 WearsItem(ITEM_ARTIFACT_YORUBA, EQUIP_ARMOUR) ||
1194 WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_BELT)) ) 1194 WearsItem(ITEM_ARTIFACT_CLOAK_OF_THE_SHEEP, EQUIP_CLOAK)) )
1195 1195
1196 return 0; 1196 return 0;
1197 PlaySound((PlayerSpeech)34, 0); 1197 PlaySound((PlayerSpeech)34, 0);
1198 break; 1198 break;
1199 case Condition_Eradicated: 1199 case Condition_Eradicated: