diff options
| author | megamage <none@none> | 2009-02-04 17:22:43 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-04 17:22:43 -0600 |
| commit | d69198732e65002b53bab3a85779107490fe4dd2 (patch) | |
| tree | e1f4b11f1964cc42ac05c79bdc43eedc1db16866 /src/game/Creature.cpp | |
| parent | 5d4d9530556eb66940775f12c3cc5f3c115447ca (diff) | |
| parent | c745eba4a1d122b4184b27a982674c86ff193c23 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
| -rw-r--r-- | src/game/Creature.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 83a4a45f5f5..ca8fd942e76 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -199,10 +199,10 @@ void Creature::RemoveFromWorld() void Creature::SearchFormation() { uint32 lowguid = GetDBTableGUIDLow(); - + if(CreatureGroupMap.find(lowguid) != CreatureGroupMap.end()) { - m_formationID = CreatureGroupMap[lowguid]->leaderGUID; + m_formationID = CreatureGroupMap[lowguid]->leaderGUID; formation_mgr.UpdateCreatureGroup(m_formationID, this); } } @@ -415,7 +415,7 @@ void Creature::Update(uint32 diff) CreatureInfo const *cinfo = GetCreatureInfo(); SelectLevel(cinfo); - + if (m_isDeadByDefault) { setDeathState(JUST_DIED); @@ -1425,7 +1425,7 @@ bool Creature::LoadFromDB(uint32 guid, Map *map) } //We should set first home position, because then AI calls home movement SetHomePosition(data->posX,data->posY,data->posZ,data->orientation); - + m_respawnradius = data->spawndist; m_respawnDelay = data->spawntimesecs; |