diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-03-29 23:07:07 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-29 23:07:07 +0200 |
| commit | e334fdf3ade7c3df8df9e5730434b67fe1ed019a (patch) | |
| tree | d0d9475591a3dc3f3e75576aca8e27495bdc31e3 /src/server/game/Entities/GameObject | |
| parent | d611925dc7ab2b3f19c5ee9e0f75b8dfb6de1291 (diff) | |
Core/Units: Reduce differences between branches part 1 - object class
Diffstat (limited to 'src/server/game/Entities/GameObject')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index a207088ec5b..7d0c92b5335 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1331,7 +1331,7 @@ void GameObject::Respawn() } } -bool GameObject::ActivateToQuest(Player* target) const +bool GameObject::ActivateToQuest(Player const* target) const { if (target->HasQuestForGO(GetEntry())) return true; @@ -1344,7 +1344,7 @@ bool GameObject::ActivateToQuest(Player* target) const case GAMEOBJECT_TYPE_QUESTGIVER: { GameObject* go = const_cast<GameObject*>(this); - QuestGiverStatus questStatus = target->GetQuestDialogStatus(go); + QuestGiverStatus questStatus = const_cast<Player*>(target)->GetQuestDialogStatus(go); if (questStatus > DIALOG_STATUS_UNAVAILABLE) return true; break; @@ -2595,7 +2595,7 @@ GameObject* GameObject::GetLinkedTrap() return ObjectAccessor::GetGameObject(*this, m_linkedTrap); } -void GameObject::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* target) const +void GameObject::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player const* target) const { if (!target) return; diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 84128744eee..0646b53b85f 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -83,7 +83,7 @@ class TC_GAME_API GameObject : public WorldObject, public GridObject<GameObject> explicit GameObject(); ~GameObject(); - void BuildValuesUpdate(uint8 updatetype, ByteBuffer* data, Player* target) const override; + void BuildValuesUpdate(uint8 updatetype, ByteBuffer* data, Player const* target) const override; void AddToWorld() override; void RemoveFromWorld() override; @@ -225,7 +225,7 @@ class TC_GAME_API GameObject : public WorldObject, public GridObject<GameObject> bool hasQuest(uint32 quest_id) const override; bool hasInvolvedQuest(uint32 quest_id) const override; - bool ActivateToQuest(Player* target) const; + bool ActivateToQuest(Player const* target) const; void UseDoorOrButton(uint32 time_to_restore = 0, bool alternative = false, Unit* user = nullptr); // 0 = use `gameobject`.`spawntimesecs` void ResetDoorOrButton(); |