aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2022-10-24 00:15:43 +0200
committerShauren <shauren.trinity@gmail.com>2022-10-24 00:15:43 +0200
commit2c79ce67917e76fad768c857d223631c160c260d (patch)
treec428cbc7c20998adff1a067102c9e14aed2eefe7 /src
parentf52f2cc67ad91fa9017f6739e0efdf9677c5d629 (diff)
Core/Conditions: Add const to condition checking functions
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Conditions/ConditionMgr.cpp106
-rw-r--r--src/server/game/Conditions/ConditionMgr.h20
-rw-r--r--src/server/game/Entities/Object/Object.cpp2
-rw-r--r--src/server/game/Entities/Player/Player.cpp6
-rw-r--r--src/server/game/Entities/Player/Player.h2
-rw-r--r--src/server/game/Entities/Player/SceneMgr.cpp4
-rw-r--r--src/server/game/Entities/Player/SceneMgr.h4
-rw-r--r--src/server/game/Loot/Loot.cpp2
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp2
-rw-r--r--src/server/scripts/Outland/zone_nagrand.cpp4
10 files changed, 76 insertions, 76 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 89d4a4d70c1..b456cd24029 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -154,7 +154,7 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND
{ "Player Condition", true, false, false },
};
-ConditionSourceInfo::ConditionSourceInfo(WorldObject* target0, WorldObject* target1, WorldObject* target2)
+ConditionSourceInfo::ConditionSourceInfo(WorldObject const* target0, WorldObject const* target1, WorldObject const* target2)
{
mConditionTargets[0] = target0;
mConditionTargets[1] = target1;
@@ -248,7 +248,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
break;
}
- WorldObject* object = sourceInfo.mConditionTargets[ConditionTarget];
+ WorldObject const* object = sourceInfo.mConditionTargets[ConditionTarget];
// object not present, return false
if (needsObject && !object)
{
@@ -259,13 +259,13 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
{
case CONDITION_AURA:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
condMeets = unit->HasAuraEffect(ConditionValue1, ConditionValue2);
break;
}
case CONDITION_ITEM:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
{
// don't allow 0 items (it's checked during table load)
ASSERT(ConditionValue2);
@@ -276,7 +276,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_ITEM_EQUIPPED:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->HasItemOrGemWithIdEquipped(ConditionValue1, 1);
break;
}
@@ -285,7 +285,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
break;
case CONDITION_REPUTATION_RANK:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
{
if (FactionEntry const* faction = sFactionStore.LookupEntry(ConditionValue1))
condMeets = (ConditionValue2 & (1 << player->GetReputationMgr().GetRank(faction))) != 0;
@@ -294,49 +294,49 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_ACHIEVEMENT:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->HasAchieved(ConditionValue1);
break;
}
case CONDITION_TEAM:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->GetTeam() == ConditionValue1;
break;
}
case CONDITION_CLASS:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
condMeets = (unit->GetClassMask() & ConditionValue1) != 0;
break;
}
case CONDITION_RACE:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
condMeets = Trinity::RaceMask<uint32>{ ConditionValue1 }.HasRace(unit->GetRace());
break;
}
case CONDITION_GENDER:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->GetNativeGender() == Gender(ConditionValue1);
break;
}
case CONDITION_SKILL:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->HasSkill(ConditionValue1) && player->GetBaseSkillValue(ConditionValue1) >= ConditionValue2;
break;
}
case CONDITION_QUESTREWARDED:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->GetQuestRewardStatus(ConditionValue1);
break;
}
case CONDITION_QUESTTAKEN:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
{
QuestStatus status = player->GetQuestStatus(ConditionValue1);
condMeets = (status == QUEST_STATUS_INCOMPLETE);
@@ -345,7 +345,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_QUEST_COMPLETE:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
{
QuestStatus status = player->GetQuestStatus(ConditionValue1);
condMeets = (status == QUEST_STATUS_COMPLETE && !player->GetQuestRewardStatus(ConditionValue1));
@@ -354,7 +354,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_QUEST_NONE:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
{
QuestStatus status = player->GetQuestStatus(ConditionValue1);
condMeets = (status == QUEST_STATUS_NONE);
@@ -366,19 +366,19 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
break;
case CONDITION_SPELL:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->HasSpell(ConditionValue1);
break;
}
case CONDITION_LEVEL:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
condMeets = CompareValues(static_cast<ComparisionType>(ConditionValue2), static_cast<uint32>(unit->GetLevel()), ConditionValue1);
break;
}
case CONDITION_DRUNKENSTATE:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = (uint32)Player::GetDrunkenstateByValue(player->GetDrunkValue()) >= ConditionValue1;
break;
}
@@ -422,10 +422,10 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_RELATION_TO:
{
- if (WorldObject* toObject = sourceInfo.mConditionTargets[ConditionValue1])
+ if (WorldObject const* toObject = sourceInfo.mConditionTargets[ConditionValue1])
{
- Unit* toUnit = toObject->ToUnit();
- Unit* unit = object->ToUnit();
+ Unit const* toUnit = toObject->ToUnit();
+ Unit const* unit = object->ToUnit();
if (toUnit && unit)
{
switch (static_cast<RelationType>(ConditionValue2))
@@ -457,10 +457,10 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_REACTION_TO:
{
- if (WorldObject* toObject = sourceInfo.mConditionTargets[ConditionValue1])
+ if (WorldObject const* toObject = sourceInfo.mConditionTargets[ConditionValue1])
{
- Unit* toUnit = toObject->ToUnit();
- Unit* unit = object->ToUnit();
+ Unit const* toUnit = toObject->ToUnit();
+ Unit const* unit = object->ToUnit();
if (toUnit && unit)
condMeets = ((1 << unit->GetReactionTo(toUnit)) & ConditionValue2) != 0;
}
@@ -468,25 +468,25 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_DISTANCE_TO:
{
- if (WorldObject* toObject = sourceInfo.mConditionTargets[ConditionValue1])
+ if (WorldObject const* toObject = sourceInfo.mConditionTargets[ConditionValue1])
condMeets = CompareValues(static_cast<ComparisionType>(ConditionValue3), object->GetDistance(toObject), static_cast<float>(ConditionValue2));
break;
}
case CONDITION_ALIVE:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
condMeets = unit->IsAlive();
break;
}
case CONDITION_HP_VAL:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
condMeets = CompareValues(static_cast<ComparisionType>(ConditionValue2), unit->GetHealth(), static_cast<uint64>(ConditionValue1));
break;
}
case CONDITION_HP_PCT:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
condMeets = CompareValues(static_cast<ComparisionType>(ConditionValue2), unit->GetHealthPct(), static_cast<float>(ConditionValue1));
break;
}
@@ -497,25 +497,25 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_TITLE:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->HasTitle(ConditionValue1);
break;
}
case CONDITION_UNIT_STATE:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
condMeets = unit->HasUnitState(ConditionValue1);
break;
}
case CONDITION_CREATURE_TYPE:
{
- if (Creature* creature = object->ToCreature())
+ if (Creature const* creature = object->ToCreature())
condMeets = creature->GetCreatureTemplate()->type == ConditionValue1;
break;
}
case CONDITION_IN_WATER:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
condMeets = unit->IsInWater();
break;
}
@@ -526,7 +526,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_STAND_STATE:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
{
if (ConditionValue1 == 0)
condMeets = (unit->GetStandState() == UnitStandStateType(ConditionValue2));
@@ -539,32 +539,32 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_DAILY_QUEST_DONE:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->IsDailyQuestDone(ConditionValue1);
break;
}
case CONDITION_CHARMED:
{
- if (Unit* unit = object->ToUnit())
+ if (Unit const* unit = object->ToUnit())
condMeets = unit->IsCharmed();
break;
}
case CONDITION_PET_TYPE:
{
- if (Player* player = object->ToPlayer())
- if (Pet* pet = player->GetPet())
+ if (Player const* player = object->ToPlayer())
+ if (Pet const* pet = player->GetPet())
condMeets = (((1 << pet->getPetType()) & ConditionValue1) != 0);
break;
}
case CONDITION_TAXI:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->IsInFlight();
break;
}
case CONDITION_QUESTSTATE:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
{
if (
((ConditionValue2 & (1 << QUEST_STATUS_NONE)) && (player->GetQuestStatus(ConditionValue1) == QUEST_STATUS_NONE)) ||
@@ -579,7 +579,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_QUEST_OBJECTIVE_PROGRESS:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
{
QuestObjective const* obj = sObjectMgr->GetQuestObjective(ConditionValue1);
if (!obj)
@@ -599,7 +599,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_GAMEMASTER:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
{
if (ConditionValue1 == 1)
condMeets = player->CanBeGameMaster();
@@ -610,7 +610,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_BATTLE_PET_COUNT:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = CompareValues(static_cast<ComparisionType>(ConditionValue3),
player->GetSession()->GetBattlePetMgr()->GetPetCount(sBattlePetSpeciesStore.AssertEntry(ConditionValue1), player->GetGUID()),
static_cast<uint8>(ConditionValue2));
@@ -618,13 +618,13 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
case CONDITION_SCENE_IN_PROGRESS:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
condMeets = player->GetSceneMgr().GetActiveSceneCount(ConditionValue1) > 0;
break;
}
case CONDITION_PLAYER_CONDITION:
{
- if (Player* player = object->ToPlayer())
+ if (Player const* player = object->ToPlayer())
if (PlayerConditionEntry const* playerCondition = sPlayerConditionStore.LookupEntry(ConditionValue1))
condMeets = ConditionMgr::IsPlayerMeetingCondition(player, playerCondition);
break;
@@ -990,13 +990,13 @@ bool ConditionMgr::IsObjectMeetToConditionList(ConditionSourceInfo& sourceInfo,
return false;
}
-bool ConditionMgr::IsObjectMeetToConditions(WorldObject* object, ConditionContainer const& conditions) const
+bool ConditionMgr::IsObjectMeetToConditions(WorldObject const* object, ConditionContainer const& conditions) const
{
ConditionSourceInfo srcInfo = ConditionSourceInfo(object);
return IsObjectMeetToConditions(srcInfo, conditions);
}
-bool ConditionMgr::IsObjectMeetToConditions(WorldObject* object1, WorldObject* object2, ConditionContainer const& conditions) const
+bool ConditionMgr::IsObjectMeetToConditions(WorldObject const* object1, WorldObject const* object2, ConditionContainer const& conditions) const
{
ConditionSourceInfo srcInfo = ConditionSourceInfo(object1, object2);
return IsObjectMeetToConditions(srcInfo, conditions);
@@ -1084,7 +1084,7 @@ bool ConditionMgr::IsObjectMeetingNotGroupedConditions(ConditionSourceType sourc
return true;
}
-bool ConditionMgr::IsObjectMeetingNotGroupedConditions(ConditionSourceType sourceType, uint32 entry, WorldObject* target0, WorldObject* target1 /*= nullptr*/, WorldObject* target2 /*= nullptr*/) const
+bool ConditionMgr::IsObjectMeetingNotGroupedConditions(ConditionSourceType sourceType, uint32 entry, WorldObject const* target0, WorldObject const* target1 /*= nullptr*/, WorldObject const* target2 /*= nullptr*/) const
{
ConditionSourceInfo conditionSource(target0, target1, target2);
return IsObjectMeetingNotGroupedConditions(sourceType, entry, conditionSource);
@@ -1105,7 +1105,7 @@ bool ConditionMgr::HasConditionsForNotGroupedEntry(ConditionSourceType sourceTyp
return false;
}
-bool ConditionMgr::IsObjectMeetingSpellClickConditions(uint32 creatureId, uint32 spellId, WorldObject* clicker, WorldObject* target) const
+bool ConditionMgr::IsObjectMeetingSpellClickConditions(uint32 creatureId, uint32 spellId, WorldObject const* clicker, WorldObject const* target) const
{
ConditionEntriesByCreatureIdMap::const_iterator itr = SpellClickEventConditionStore.find(creatureId);
if (itr != SpellClickEventConditionStore.end())
@@ -1136,7 +1136,7 @@ ConditionContainer const* ConditionMgr::GetConditionsForSpellClickEvent(uint32 c
return nullptr;
}
-bool ConditionMgr::IsObjectMeetingVehicleSpellConditions(uint32 creatureId, uint32 spellId, Player* player, Unit* vehicle) const
+bool ConditionMgr::IsObjectMeetingVehicleSpellConditions(uint32 creatureId, uint32 spellId, Player const* player, Unit const* vehicle) const
{
ConditionEntriesByCreatureIdMap::const_iterator itr = VehicleSpellConditionStore.find(creatureId);
if (itr != VehicleSpellConditionStore.end())
@@ -1152,7 +1152,7 @@ bool ConditionMgr::IsObjectMeetingVehicleSpellConditions(uint32 creatureId, uint
return true;
}
-bool ConditionMgr::IsObjectMeetingSmartEventConditions(int64 entryOrGuid, uint32 eventId, uint32 sourceType, Unit* unit, WorldObject* baseObject) const
+bool ConditionMgr::IsObjectMeetingSmartEventConditions(int64 entryOrGuid, uint32 eventId, uint32 sourceType, Unit const* unit, WorldObject const* baseObject) const
{
SmartEventConditionContainer::const_iterator itr = SmartEventConditionStore.find(std::make_pair(entryOrGuid, sourceType));
if (itr != SmartEventConditionStore.end())
@@ -1168,7 +1168,7 @@ bool ConditionMgr::IsObjectMeetingSmartEventConditions(int64 entryOrGuid, uint32
return true;
}
-bool ConditionMgr::IsObjectMeetingVendorItemConditions(uint32 creatureId, uint32 itemId, Player* player, Creature* vendor) const
+bool ConditionMgr::IsObjectMeetingVendorItemConditions(uint32 creatureId, uint32 itemId, Player const* player, Creature const* vendor) const
{
ConditionEntriesByCreatureIdMap::const_iterator itr = NpcVendorConditionContainerStore.find(creatureId);
if (itr != NpcVendorConditionContainerStore.end())
@@ -1209,7 +1209,7 @@ bool ConditionMgr::IsObjectMeetingTrainerSpellConditions(uint32 trainerId, uint3
return true;
}
-bool ConditionMgr::IsObjectMeetingVisibilityByObjectIdConditions(uint32 objectType, uint32 entry, WorldObject* seer) const
+bool ConditionMgr::IsObjectMeetingVisibilityByObjectIdConditions(uint32 objectType, uint32 entry, WorldObject const* seer) const
{
if (ConditionContainer const* conditions = Trinity::Containers::MapGetValuePtr(ObjectVisibilityConditionStore, { objectType, entry }))
{
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index 6d0e3d625d3..1df6aa08a21 100644
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -211,10 +211,10 @@ enum MaxConditionTargets
struct TC_GAME_API ConditionSourceInfo
{
- WorldObject* mConditionTargets[MAX_CONDITION_TARGETS]; // an array of targets available for conditions
+ WorldObject const* mConditionTargets[MAX_CONDITION_TARGETS]; // an array of targets available for conditions
Map const* mConditionMap;
Condition const* mLastFailedCondition;
- ConditionSourceInfo(WorldObject* target0, WorldObject* target1 = nullptr, WorldObject* target2 = nullptr);
+ ConditionSourceInfo(WorldObject const* target0, WorldObject const* target1 = nullptr, WorldObject const* target2 = nullptr);
ConditionSourceInfo(Map const* map);
};
@@ -284,27 +284,27 @@ class TC_GAME_API ConditionMgr
bool isConditionTypeValid(Condition* cond) const;
uint32 GetSearcherTypeMaskForConditionList(ConditionContainer const& conditions) const;
- bool IsObjectMeetToConditions(WorldObject* object, ConditionContainer const& conditions) const;
- bool IsObjectMeetToConditions(WorldObject* object1, WorldObject* object2, ConditionContainer const& conditions) const;
+ bool IsObjectMeetToConditions(WorldObject const* object, ConditionContainer const& conditions) const;
+ bool IsObjectMeetToConditions(WorldObject const* object1, WorldObject const* object2, ConditionContainer const& conditions) const;
bool IsObjectMeetToConditions(ConditionSourceInfo& sourceInfo, ConditionContainer const& conditions) const;
static bool CanHaveSourceGroupSet(ConditionSourceType sourceType);
static bool CanHaveSourceIdSet(ConditionSourceType sourceType);
static bool CanHaveConditionType(ConditionSourceType sourceType, ConditionTypes conditionType);
bool IsObjectMeetingNotGroupedConditions(ConditionSourceType sourceType, uint32 entry, ConditionSourceInfo& sourceInfo) const;
- bool IsObjectMeetingNotGroupedConditions(ConditionSourceType sourceType, uint32 entry, WorldObject* target0, WorldObject* target1 = nullptr, WorldObject* target2 = nullptr) const;
+ bool IsObjectMeetingNotGroupedConditions(ConditionSourceType sourceType, uint32 entry, WorldObject const* target0, WorldObject const* target1 = nullptr, WorldObject const* target2 = nullptr) const;
bool IsMapMeetingNotGroupedConditions(ConditionSourceType sourceType, uint32 entry, Map const* map) const;
bool HasConditionsForNotGroupedEntry(ConditionSourceType sourceType, uint32 entry) const;
- bool IsObjectMeetingSpellClickConditions(uint32 creatureId, uint32 spellId, WorldObject* clicker, WorldObject* target) const;
+ bool IsObjectMeetingSpellClickConditions(uint32 creatureId, uint32 spellId, WorldObject const* clicker, WorldObject const* target) const;
ConditionContainer const* GetConditionsForSpellClickEvent(uint32 creatureId, uint32 spellId) const;
- bool IsObjectMeetingVehicleSpellConditions(uint32 creatureId, uint32 spellId, Player* player, Unit* vehicle) const;
- bool IsObjectMeetingSmartEventConditions(int64 entryOrGuid, uint32 eventId, uint32 sourceType, Unit* unit, WorldObject* baseObject) const;
- bool IsObjectMeetingVendorItemConditions(uint32 creatureId, uint32 itemId, Player* player, Creature* vendor) const;
+ bool IsObjectMeetingVehicleSpellConditions(uint32 creatureId, uint32 spellId, Player const* player, Unit const* vehicle) const;
+ bool IsObjectMeetingSmartEventConditions(int64 entryOrGuid, uint32 eventId, uint32 sourceType, Unit const* unit, WorldObject const* baseObject) const;
+ bool IsObjectMeetingVendorItemConditions(uint32 creatureId, uint32 itemId, Player const* player, Creature const* vendor) const;
bool IsSpellUsedInSpellClickConditions(uint32 spellId) const;
ConditionContainer const* GetConditionsForAreaTrigger(uint32 areaTriggerId, bool isServerSide) const;
bool IsObjectMeetingTrainerSpellConditions(uint32 trainerId, uint32 spellId, Player* player) const;
- bool IsObjectMeetingVisibilityByObjectIdConditions(uint32 objectType, uint32 entry, WorldObject* seer) const;
+ bool IsObjectMeetingVisibilityByObjectIdConditions(uint32 objectType, uint32 entry, WorldObject const* seer) const;
static uint32 GetPlayerConditionLfgValue(Player const* player, PlayerConditionLfgStatus status);
static bool IsPlayerMeetingCondition(Player const* player, PlayerConditionEntry const* condition);
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 8815f3d5416..27492b5d31b 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1452,7 +1452,7 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
if (smoothPhasing->IsBeingReplacedForSeer(GetGUID()))
return false;
- if (!sConditionMgr->IsObjectMeetingVisibilityByObjectIdConditions(obj->GetTypeId(), obj->GetEntry(), const_cast<WorldObject*>(this)))
+ if (!sConditionMgr->IsObjectMeetingVisibilityByObjectIdConditions(obj->GetTypeId(), obj->GetEntry(), this))
return false;
bool corpseVisibility = false;
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index bbe918e106d..7ece702802f 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -15363,7 +15363,7 @@ bool Player::SatisfyQuestStatus(Quest const* qInfo, bool msg) const
bool Player::SatisfyQuestConditions(Quest const* qInfo, bool msg) const
{
- if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_QUEST_AVAILABLE, qInfo->GetQuestId(), const_cast<Player*>(this)))
+ if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_QUEST_AVAILABLE, qInfo->GetQuestId(), this))
{
if (msg)
{
@@ -23897,7 +23897,7 @@ void Player::SetDailyQuestStatus(uint32 quest_id)
}
}
-bool Player::IsDailyQuestDone(uint32 quest_id)
+bool Player::IsDailyQuestDone(uint32 quest_id) const
{
return m_activePlayerData->DailyQuestsCompleted.FindIndex(quest_id) >= 0;
}
@@ -26144,7 +26144,7 @@ bool Player::CanSeeSpellClickOn(Creature const* c) const
if (!clickPair.second.IsFitToRequirements(this, c))
return false;
- if (sConditionMgr->IsObjectMeetingSpellClickConditions(c->GetEntry(), clickPair.second.spellId, const_cast<Player*>(this), const_cast<Creature*>(c)))
+ if (sConditionMgr->IsObjectMeetingSpellClickConditions(c->GetEntry(), clickPair.second.spellId, this, c))
return true;
}
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 41ba3ef8123..7cf62d43c6e 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1549,7 +1549,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
QuestGiverStatus GetQuestDialogStatus(Object* questGiver);
void SetDailyQuestStatus(uint32 quest_id);
- bool IsDailyQuestDone(uint32 quest_id);
+ bool IsDailyQuestDone(uint32 quest_id) const;
void SetWeeklyQuestStatus(uint32 quest_id);
void SetMonthlyQuestStatus(uint32 quest_id);
void SetSeasonalQuestStatus(uint32 quest_id);
diff --git a/src/server/game/Entities/Player/SceneMgr.cpp b/src/server/game/Entities/Player/SceneMgr.cpp
index d44182fb9eb..28978fd60ea 100644
--- a/src/server/game/Entities/Player/SceneMgr.cpp
+++ b/src/server/game/Entities/Player/SceneMgr.cpp
@@ -216,7 +216,7 @@ void SceneMgr::RemoveAurasDueToSceneId(uint32 sceneId)
}
}
-SceneTemplate const* SceneMgr::GetSceneTemplateFromInstanceId(uint32 sceneInstanceID)
+SceneTemplate const* SceneMgr::GetSceneTemplateFromInstanceId(uint32 sceneInstanceID) const
{
auto itr = _scenesByInstance.find(sceneInstanceID);
@@ -226,7 +226,7 @@ SceneTemplate const* SceneMgr::GetSceneTemplateFromInstanceId(uint32 sceneInstan
return nullptr;
}
-uint32 SceneMgr::GetActiveSceneCount(uint32 sceneScriptPackageId /*= 0*/)
+uint32 SceneMgr::GetActiveSceneCount(uint32 sceneScriptPackageId /*= 0*/) const
{
uint32 activeSceneCount = 0;
diff --git a/src/server/game/Entities/Player/SceneMgr.h b/src/server/game/Entities/Player/SceneMgr.h
index 4cb6db547fb..664bf6a5d6e 100644
--- a/src/server/game/Entities/Player/SceneMgr.h
+++ b/src/server/game/Entities/Player/SceneMgr.h
@@ -64,8 +64,8 @@ public:
void RemoveSceneInstanceId(uint32 sceneInstanceID);
void RemoveAurasDueToSceneId(uint32 sceneId);
- SceneTemplate const* GetSceneTemplateFromInstanceId(uint32 sceneInstanceID);
- uint32 GetActiveSceneCount(uint32 sceneScriptPackageId = 0);
+ SceneTemplate const* GetSceneTemplateFromInstanceId(uint32 sceneInstanceID) const;
+ uint32 GetActiveSceneCount(uint32 sceneScriptPackageId = 0) const;
SceneTemplateByInstance const& GetSceneTemplateByInstanceMap() const { return _scenesByInstance; }
uint32 GetNewStandaloneSceneInstanceID() { return ++_standaloneSceneInstanceID; }
diff --git a/src/server/game/Loot/Loot.cpp b/src/server/game/Loot/Loot.cpp
index 6c5dd9286d0..5b12fcc0a4e 100644
--- a/src/server/game/Loot/Loot.cpp
+++ b/src/server/game/Loot/Loot.cpp
@@ -71,7 +71,7 @@ LootItem::~LootItem() = default;
bool LootItem::AllowedForPlayer(Player const* player, Loot const& loot) const
{
// DB conditions check
- if (!sConditionMgr->IsObjectMeetToConditions(const_cast<Player*>(player), conditions))
+ if (!sConditionMgr->IsObjectMeetToConditions(player, conditions))
return false;
ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(itemid);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
index f1fef936a9a..16c1503c7d6 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
@@ -2116,7 +2116,7 @@ class condition_thorim_arena_leap : public ConditionScript
bool OnConditionCheck(Condition const* condition, ConditionSourceInfo& sourceInfo) override
{
- WorldObject* target = sourceInfo.mConditionTargets[condition->ConditionTarget];
+ WorldObject const* target = sourceInfo.mConditionTargets[condition->ConditionTarget];
InstanceScript* instance = target->GetInstanceScript();
if (!instance)
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index a1517edd60f..ac2d55346bc 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -693,8 +693,8 @@ public:
bool OnConditionCheck(Condition const* condition, ConditionSourceInfo& sourceInfo) override
{
- WorldObject* target = sourceInfo.mConditionTargets[condition->ConditionTarget];
- if (Creature* creature = target->ToCreature())
+ WorldObject const* target = sourceInfo.mConditionTargets[condition->ConditionTarget];
+ if (Creature const* creature = target->ToCreature())
{
if (npc_nagrand_banner::npc_nagrand_bannerAI *ai = CAST_AI(npc_nagrand_banner::npc_nagrand_bannerAI, creature->AI()))
return !ai->IsBannered();