aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Achievements/CriteriaHandler.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-09-27 20:05:36 +0200
committerShauren <shauren.trinity@gmail.com>2024-09-27 20:05:36 +0200
commit89f490bdcdf88c2576c17218926e89b1082ae682 (patch)
tree356a0be852515b56736f21bc60af3649c4153032 /src/server/game/Achievements/CriteriaHandler.cpp
parentbe04c17916aa35173ed328eb27cb5f246bc8b863 (diff)
Core/DataStores: Removed overriding field sign type based on db2 column compression
Diffstat (limited to 'src/server/game/Achievements/CriteriaHandler.cpp')
-rw-r--r--src/server/game/Achievements/CriteriaHandler.cpp14
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;