*Fix the bug that summon dbc is not read. Now creatures can be summoned.

*Make minipet as tempsummon instead of pet. Make totem as tempsummon.

--HG--
branch : trunk

1 files changed, 1 insertions, 9 deletions

diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index 32ffd80801b..d7721070e63 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -51,7 +51,7 @@ m_declinedname(NULL)
     // pets always have a charminfo, even if they are not actually charmed
     CharmInfo* charmInfo = InitCharmInfo();
 
-    if(type == MINI_PET || type == POSSESSED_PET)                                    // always passive
+    if(type == POSSESSED_PET)                                    // always passive
         SetReactState(REACT_PASSIVE);
     else if(type == GUARDIAN_PET)                           // always aggressive
         SetReactState(REACT_AGGRESSIVE);
@@ -744,11 +744,6 @@ bool Pet::CreateBaseAtCreature(Creature* creature)
         return false;
     }
 
-    if(cinfo->type == CREATURE_TYPE_CRITTER)
-    {
-        setPetType(MINI_PET);
-        return true;
-    }
     SetDisplayId(creature->GetDisplayId());
     SetNativeDisplayId(creature->GetNativeDisplayId());
     SetMaxPower(POWER_HAPPINESS, GetCreatePowers(POWER_HAPPINESS));
@@ -1725,9 +1720,6 @@ bool Pet::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint3
 
     SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
 
-    if(getPetType() == MINI_PET)                            // always non-attackable
-        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-
     return true;
 }