From a3b1a7cd23734ea431210258806e88addd590886 Mon Sep 17 00:00:00 2001 From: TOM_RUS Date: Thu, 18 Nov 2010 23:21:25 +0300 Subject: [PATCH] [10738] In fact set pet name to empety state redundent. Client work propertly also if used default name from creature template (set in create code). Signed-off-by: VladimirMangos --- src/game/SpellEffects.cpp | 8 ++++---- src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 06bcdbad4c3..9c4b92a6c8f 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -4250,7 +4250,7 @@ void Spell::DoSummon(SpellEffectIndex eff_idx) spawnCreature->SetHealth(spawnCreature->GetMaxHealth()); spawnCreature->SetPower(POWER_MANA, spawnCreature->GetMaxPower(POWER_MANA)); - spawnCreature->SetName(""); // generated by client + //spawnCreature->SetName(""); // generated by client map->Add((Creature*)spawnCreature); @@ -4666,7 +4666,7 @@ void Spell::DoSummonGuardian(SpellEffectIndex eff_idx, uint32 forceFaction) if (duration > 0) spawnCreature->SetDuration(duration); - spawnCreature->SetName(""); // generated by client + //spawnCreature->SetName(""); // generated by client spawnCreature->SetOwnerGuid(m_caster->GetObjectGuid()); spawnCreature->setPowerType(POWER_MANA); spawnCreature->SetUInt32Value(UNIT_NPC_FLAGS, spawnCreature->GetCreatureInfo()->npcflag); @@ -7072,7 +7072,7 @@ void Spell::DoSummonTotem(SpellEffectIndex eff_idx, uint8 slot_dbc) if (slot < MAX_TOTEM_SLOT) m_caster->_AddTotem(TotemSlot(slot),pTotem); - pTotem->SetName(""); // generated by client + //pTotem->SetName(""); // generated by client pTotem->SetOwner(m_caster); pTotem->SetTypeBySummonSpell(m_spellInfo); // must be after Create call where m_spells initialized @@ -7584,7 +7584,7 @@ void Spell::DoSummonCritter(SpellEffectIndex eff_idx, uint32 forceFaction) return; } - critter->SetName(""); // generated by client + //critter->SetName(""); // generated by client critter->SetOwnerGuid(m_caster->GetObjectGuid()); critter->SetCreatorGuid(m_caster->GetObjectGuid()); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5b22b7b3a4b..adfad18a884 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10737" + #define REVISION_NR "10738" #endif // __REVISION_NR_H__