From d12fec67f203805178906dca376fa5e557157d15 Mon Sep 17 00:00:00 2001 From: DDuarte Date: Wed, 22 Jul 2015 23:24:56 +0100 Subject: Core/Misc: Add a few consts to methods (cherry picked from commit 7d9843c380cf00f38ad0c5bc75fd387e50ee11da) Conflicts: src/server/bnetserver/Packets/ConnectionPackets.h src/server/game/AI/SmartScripts/SmartAI.h src/server/game/Battlefield/Battlefield.h src/server/game/Battlegrounds/Battleground.h src/server/game/Entities/Object/Object.h src/server/game/Entities/Player/Player.h src/server/game/Guilds/Guild.h src/server/game/Instances/InstanceSaveMgr.h src/server/game/Support/SupportMgr.h --- src/server/game/AI/ScriptedAI/ScriptedEscortAI.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/AI/ScriptedAI') diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h index 75ff1b8dfc9..1d71652c948 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h @@ -94,16 +94,16 @@ struct npc_escortAI : public ScriptedAI void SetEscortPaused(bool on); bool HasEscortState(uint32 escortState) { return (m_uiEscortState & escortState) != 0; } - virtual bool IsEscorted() override { return (m_uiEscortState & STATE_ESCORT_ESCORTING); } + virtual bool IsEscorted() const override { return (m_uiEscortState & STATE_ESCORT_ESCORTING); } void SetMaxPlayerDistance(float newMax) { MaxPlayerDistance = newMax; } - float GetMaxPlayerDistance() { return MaxPlayerDistance; } + float GetMaxPlayerDistance() const { return MaxPlayerDistance; } void SetDespawnAtEnd(bool despawn) { DespawnAtEnd = despawn; } void SetDespawnAtFar(bool despawn) { DespawnAtFar = despawn; } - bool GetAttack() { return m_bIsActiveAttacker; }//used in EnterEvadeMode override + bool GetAttack() const { return m_bIsActiveAttacker; }//used in EnterEvadeMode override void SetCanAttack(bool attack) { m_bIsActiveAttacker = attack; } - ObjectGuid GetEventStarterGUID() { return m_uiPlayerGUID; } + ObjectGuid GetEventStarterGUID() const { return m_uiPlayerGUID; } protected: Player* GetPlayerForEscort() { return ObjectAccessor::GetPlayer(*me, m_uiPlayerGUID); } -- cgit v1.2.3