diff options
Diffstat (limited to 'src/server/game/Achievements/CriteriaHandler.cpp')
| -rw-r--r-- | src/server/game/Achievements/CriteriaHandler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp index 0d542425547..e64f701dab7 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -715,7 +715,7 @@ void CriteriaHandler::UpdateCriteria(CriteriaType type, uint64 miscValue1 /*= 0* SkillLineAbilityMapBounds bounds = sSpellMgr->GetSkillLineAbilityMapBounds(spellId); for (SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter) { - if (skillIter->second->SkillLine == int32(criteria->Entry->Asset.SkillID)) + if (skillIter->second->SkillLine == uint32(criteria->Entry->Asset.SkillID)) { // do not add couter twice if by any chance skill is listed twice in dbc (eg. skill 777 and spell 22717) ++spellCount; @@ -2446,7 +2446,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 GarrBuildingEntry const* followerBuilding = sGarrBuildingStore.LookupEntry(follower.PacketInfo.CurrentBuildingID); if (!followerBuilding) return false; - return followerBuilding->BuildingType == int32(secondaryAsset) && follower.HasAbility(reqValue);; + return followerBuilding->BuildingType == secondaryAsset && follower.HasAbility(reqValue);; }); if (followerCount < 1) return false; @@ -2465,7 +2465,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 GarrBuildingEntry const* followerBuilding = sGarrBuildingStore.LookupEntry(follower.PacketInfo.CurrentBuildingID); if (!followerBuilding) return false; - return followerBuilding->BuildingType == int32(secondaryAsset) && follower.HasAbility(reqValue);; + return followerBuilding->BuildingType == secondaryAsset && follower.HasAbility(reqValue);; }); if (followerCount < 1) return false; @@ -2483,7 +2483,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 GarrBuildingEntry const* followerBuilding = sGarrBuildingStore.LookupEntry(follower.PacketInfo.CurrentBuildingID); if (!followerBuilding) return false; - return followerBuilding->BuildingType == int32(secondaryAsset); + return followerBuilding->BuildingType == secondaryAsset; }); if (followerCount < 1) return false; @@ -2500,7 +2500,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 continue; GarrBuildingEntry const* building = sGarrBuildingStore.LookupEntry(plot->BuildingInfo.PacketInfo->GarrBuildingID); - if (!building || building->UpgradeLevel < reqValue || building->BuildingType != int32(secondaryAsset)) + if (!building || building->UpgradeLevel < reqValue || building->BuildingType != secondaryAsset) continue; return true; @@ -2564,7 +2564,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 continue; GarrBuildingEntry const* building = sGarrBuildingStore.LookupEntry(plot->BuildingInfo.PacketInfo->GarrBuildingID); - if (!building || building->UpgradeLevel != secondaryAsset || building->BuildingType != int32(reqValue)) + if (!building || building->UpgradeLevel != secondaryAsset || building->BuildingType != reqValue) continue; return true; @@ -3937,7 +3937,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 if (item->GetVisibleAppearanceModId(referencePlayer) == itemModifiedAppearance->ID) return ItemSearchCallbackResult::Stop; - if (int32(item->GetEntry()) == itemModifiedAppearance->ItemID) + if (item->GetEntry() == itemModifiedAppearance->ItemID) return ItemSearchCallbackResult::Stop; return ItemSearchCallbackResult::Continue; |