aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellEffects.cpp
diff options
context:
space:
mode:
authorw12x <none@none>2008-10-27 15:28:04 -0500
committerw12x <none@none>2008-10-27 15:28:04 -0500
commitdd977765014498fd97dd89f68738e5fa2306e465 (patch)
tree430b12a23424896c2cb2a5aaaef8192030f12888 /src/game/SpellEffects.cpp
parent1b820f93ebadc6f253a0b1baa958abe3ab482e2d (diff)
[svn] * Fixed startup error flood if creature model id is 0
* Fixed totems using proper model ids broken after recent change * Set pet grid activity state to that of caster upon summoning * Fix a possible crash in ObjectAccessor note to self: don't commit anything without 3 days testing. ever. after this one ofc. --HG-- branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
-rw-r--r--src/game/SpellEffects.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 25454f41462..4783724d025 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -3108,6 +3108,7 @@ void Spell::EffectSummon(uint32 i)
return;
uint32 level = m_caster->getLevel();
Pet* spawnCreature = new Pet(SUMMON_PET);
+ spawnCreature->setActive(m_caster->isActive());
if(spawnCreature->LoadPetFromDB(m_caster,pet_entry))
{
@@ -3543,6 +3544,7 @@ void Spell::EffectSummonGuardian(uint32 i)
for(int32 count = 0; count < amount; ++count)
{
Pet* spawnCreature = new Pet(GUARDIAN_PET);
+ spawnCreature->setActive(m_caster->isActive());
Map *map = m_caster->GetMap();
uint32 pet_number = objmgr.GeneratePetNumber();
@@ -3937,6 +3939,7 @@ void Spell::EffectSummonPet(uint32 i)
}
Pet* NewSummon = new Pet;
+ NewSummon->setActive(m_caster->isActive());
// petentry==0 for hunter "call pet" (current pet summoned if any)
if(NewSummon->LoadPetFromDB(m_caster,petentry))