chore: rename Unit::CreateTamedPetFrom method to Unit::CreatePet

openwow-org · Aug 28, 2024 · 13a5580 · 13a5580
1 parent f545b8f
commit 13a5580
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
@@ -9215,7 +9215,7 @@ Pet* Player::CreatePet(Creature* creatureTarget, uint32 spellID /*= 0*/)
     }
 
     // Everything looks OK, create new pet
-    Pet* pet = CreateTamedPetFrom(creatureTarget, spellID);
+    Pet* pet = CreatePet(creatureTarget, spellID);
     if (!pet)
     {
         return nullptr;
@@ -9262,7 +9262,7 @@ Pet* Player::CreatePet(uint32 creatureEntry, uint32 spellID /*= 0*/)
     }
 
     // Everything looks OK, create new pet
-    Pet* pet = CreateTamedPetFrom(creatureEntry, spellID);
+    Pet* pet = CreatePet(creatureEntry, spellID);
     if (!pet)
     {
         return nullptr;

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
@@ -17546,7 +17546,7 @@ bool Unit::IsPetAura(Aura const* aura)
     return false;
 }
 
-Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget, uint32 spell_id)
+Pet* Unit::CreatePet(Creature* creatureTarget, uint32 spell_id)
 {
     if (GetTypeId() != TYPEID_PLAYER)
         return nullptr;
@@ -17570,7 +17570,7 @@ Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget, uint32 spell_id)
     return pet;
 }
 
-Pet* Unit::CreateTamedPetFrom(uint32 creatureEntry, uint32 spell_id)
+Pet* Unit::CreatePet(uint32 creatureEntry, uint32 spell_id)
 {
     if (GetTypeId() != TYPEID_PLAYER)
         return nullptr;

diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
@@ -1974,8 +1974,8 @@ class Unit : public WorldObject
     void RemoveBindSightAuras();
     void RemoveCharmAuras();
 
-    Pet* CreateTamedPetFrom(Creature* creatureTarget, uint32 spell_id = 0);
-    Pet* CreateTamedPetFrom(uint32 creatureEntry, uint32 spell_id = 0);
+    Pet* CreatePet(Creature* creatureTarget, uint32 spell_id = 0);
+    Pet* CreatePet(uint32 creatureEntry, uint32 spell_id = 0);
     bool InitTamedPet(Pet* pet, uint8 level, uint32 spell_id);
 
     // aura apply/remove helpers - you should better not use these

diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
@@ -3083,7 +3083,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/)
     //SendChannelUpdate(0);
     finish();
 
-    Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget, m_spellInfo->Id);
+    Pet* pet = m_caster->CreatePet(creatureTarget, m_spellInfo->Id);
     if (!pet)                                               // in very specific state like near world end/etc.
         return;
 
@@ -5822,7 +5822,7 @@ void Spell::EffectCreateTamedPet(SpellEffIndex effIndex)
         return;
 
     uint32 creatureEntry = m_spellInfo->Effects[effIndex].MiscValue;
-    Pet* pet = unitTarget->CreateTamedPetFrom(creatureEntry, m_spellInfo->Id);
+    Pet* pet = unitTarget->CreatePet(creatureEntry, m_spellInfo->Id);
     if (!pet)
         return;