aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Pet
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2014-08-09 20:17:40 +0100
committerDDuarte <dnpd.dd@gmail.com>2014-08-09 20:17:40 +0100
commita394205eca86d2ea2a8539734df49432189bc73b (patch)
tree124f8f2f15bd6961c91d7e042f941d3222ad50e9 /src/server/game/Entities/Pet
parent272b9d3d16cda66abb951596c87eb655d196e354 (diff)
Core/Server: Add missing overrides
Diffstat (limited to 'src/server/game/Entities/Pet')
-rw-r--r--src/server/game/Entities/Pet/Pet.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h
index 68465f6b8e7..7d4523be9af 100644
--- a/src/server/game/Entities/Pet/Pet.h
+++ b/src/server/game/Entities/Pet/Pet.h
@@ -43,10 +43,10 @@ class Pet : public Guardian
explicit Pet(Player* owner, PetType type = MAX_PET_TYPE);
virtual ~Pet();
- void AddToWorld();
- void RemoveFromWorld();
+ void AddToWorld() override;
+ void RemoveFromWorld() override;
- void SetDisplayId(uint32 modelId);
+ void SetDisplayId(uint32 modelId) override;
PetType getPetType() const { return m_petType; }
void setPetType(PetType type) { m_petType = type; }
@@ -60,16 +60,16 @@ class Pet : public Guardian
bool CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit* owner);
bool CreateBaseAtTamed(CreatureTemplate const* cinfo, Map* map, uint32 phaseMask);
bool LoadPetFromDB(Player* owner, uint32 petentry = 0, uint32 petnumber = 0, bool current = false);
- bool isBeingLoaded() const { return m_loading;}
+ bool isBeingLoaded() const override { return m_loading;}
void SavePetToDB(PetSaveMode mode);
void Remove(PetSaveMode mode, bool returnreagent = false);
static void DeleteFromDB(uint32 guidlow);
- void setDeathState(DeathState s); // overwrite virtual Creature::setDeathState and Unit::setDeathState
- void Update(uint32 diff); // overwrite virtual Creature::Update and Unit::Update
+ void setDeathState(DeathState s) override; // overwrite virtual Creature::setDeathState and Unit::setDeathState
+ void Update(uint32 diff) override; // overwrite virtual Creature::Update and Unit::Update
- uint8 GetPetAutoSpellSize() const { return m_autospells.size(); }
- uint32 GetPetAutoSpellOnPos(uint8 pos) const
+ uint8 GetPetAutoSpellSize() const override { return m_autospells.size(); }
+ uint32 GetPetAutoSpellOnPos(uint8 pos) const override
{
if (pos >= m_autospells.size())
return 0;
@@ -100,7 +100,7 @@ class Pet : public Guardian
void ToggleAutocast(SpellInfo const* spellInfo, bool apply);
- bool HasSpell(uint32 spell) const;
+ bool HasSpell(uint32 spell) const override;
void LearnPetPassives();
void CastPetAuras(bool current);
@@ -121,7 +121,7 @@ class Pet : public Guardian
bool unlearnSpell(uint32 spell_id, bool learn_prev, bool clear_ab = true);
bool removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab = true);
void CleanupActionBar();
- virtual void ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs);
+ virtual void ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs) override;
PetSpellMap m_spells;
AutoSpellList m_autospells;
@@ -129,7 +129,7 @@ class Pet : public Guardian
void InitPetCreateSpells();
bool resetTalents();
- static void resetTalentsForAllPetsOf(Player* owner, Pet* online_pet = NULL);
+ static void resetTalentsForAllPetsOf(Player* owner, Pet* online_pet = nullptr);
void InitTalentForLevel();
uint8 GetMaxTalentPointsForLevel(uint8 level);
@@ -159,11 +159,11 @@ class Pet : public Guardian
DeclinedName *m_declinedname;
private:
- void SaveToDB(uint32, uint8, uint32) // override of Creature::SaveToDB - must not be called
+ void SaveToDB(uint32, uint8, uint32) override // override of Creature::SaveToDB - must not be called
{
ASSERT(false);
}
- void DeleteFromDB() // override of Creature::DeleteFromDB - must not be called
+ void DeleteFromDB() override // override of Creature::DeleteFromDB - must not be called
{
ASSERT(false);
}