*Merge.

--HG--
branch : trunk

13 files changed, 239 insertions, 179 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 76537754b26..837a45942ab 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -139,7 +139,7 @@ m_deathTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_resp
 m_gossipOptionLoaded(false), m_emoteState(0),
 m_defaultMovementType(IDLE_MOTION_TYPE), m_DBTableGuid(0), m_equipmentId(0), m_AlreadyCallAssistance(false),
 m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false), m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL),
-m_creatureInfo(NULL), m_reactState(REACT_AGGRESSIVE), m_formationID(0), m_summonMask(SUMMON_MASK_NONE)
+m_creatureInfo(NULL), m_reactState(REACT_AGGRESSIVE), m_formation(NULL), m_summonMask(SUMMON_MASK_NONE)
 {
     m_regenTimer = 200;
     m_valuesCount = UNIT_END;
@@ -174,18 +174,18 @@ void Creature::AddToWorld()
     {
         ObjectAccessor::Instance().AddObject(this);
         Unit::AddToWorld();
-        AIM_Initialize();
         SearchFormation();
+        AIM_Initialize();
     }
 }
 
 void Creature::RemoveFromWorld()
 {
-    ///- Remove the creature from the accessor
     if(IsInWorld())
     {
-        if(m_formationID)
-            formation_mgr.DestroyGroup(m_formationID, GetGUID());
+        // Clear formation info
+        if(m_formation)
+            formation_mgr.RemoveCreatureFromGroup(m_formation, this);
         Unit::RemoveFromWorld();
         ObjectAccessor::Instance().RemoveObject(this);
     }
@@ -193,16 +193,16 @@ void Creature::RemoveFromWorld()
 
 void Creature::SearchFormation()
 {
-    if(isPet())
+    if(isSummon())
         return;
 
     uint32 lowguid = GetDBTableGUIDLow();
+    if(!lowguid)
+        return;
 
-    if(lowguid && CreatureGroupMap.find(lowguid) != CreatureGroupMap.end())
-    {
-        m_formationID = CreatureGroupMap[lowguid]->leaderGUID;
-        formation_mgr.UpdateCreatureGroup(m_formationID, this);
-    }
+    CreatureGroupInfoType::iterator frmdata = CreatureGroupMap.find(lowguid);
+    if(frmdata != CreatureGroupMap.end())
+        formation_mgr.AddCreatureToGroup(frmdata->second->leaderGUID, this);
 }
 
 void Creature::RemoveCorpse()
@@ -611,7 +611,9 @@ bool Creature::AIM_Initialize(CreatureAI* ai)
     }
 
     UnitAI *oldAI = i_AI;
-    i_motionMaster.Initialize();
+
+    Motion_Initialize();
+    
     i_AI = ai ? ai : FactorySelector::selectAI(this);
     if(oldAI) delete oldAI;
     IsAIEnabled = true;
@@ -619,6 +621,21 @@ bool Creature::AIM_Initialize(CreatureAI* ai)
     return true;
 }
 
+void Creature::Motion_Initialize()
+{
+	if(!m_formation)
+		i_motionMaster.Initialize();
+	else if(m_formation->getLeader() == this)
+	{	
+		m_formation->FormationReset(false);
+		i_motionMaster.Initialize();
+	}
+	else if(m_formation->isFormed())
+        i_motionMaster.MoveIdle(MOTION_SLOT_IDLE); //wait the order of leader
+    else
+        i_motionMaster.Initialize();
+}
+
 bool Creature::Create (uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 team, const CreatureData *data)
 {
     SetMapId(map->GetId());
@@ -1654,7 +1671,11 @@ void Creature::setDeathState(DeathState s)
             return;
 
         Unit::setDeathState(CORPSE);
-    }
+    
+		//Dismiss group if is leader
+		if(m_formation && m_formation->getLeader() == this)
+			m_formation->FormationReset(true);
+	}
     if(s == JUST_ALIVED)
     {
         //if(isPet())
@@ -1667,10 +1688,10 @@ void Creature::setDeathState(DeathState s)
         AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
         SetUInt32Value(UNIT_NPC_FLAGS, cinfo->npcflag);
         clearUnitState(UNIT_STAT_ALL_STATE);
-        i_motionMaster.Initialize();
         SetMeleeDamageSchool(SpellSchools(cinfo->dmgschool));
         LoadCreaturesAddon(true);
-    }
+        Motion_Initialize();
+	}
 }
 
 bool Creature::FallGround()
diff --git a/src/game/Creature.h b/src/game/Creature.h
index 5dd9dc9afdc..d265225e5b7 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -28,7 +28,6 @@
 #include "LootMgr.h"
 #include "Database/DatabaseEnv.h"
 #include "Cell.h"
-#include "CreatureGroups.h"
 
 #include <list>
 
@@ -38,6 +37,7 @@ class CreatureAI;
 class Quest;
 class Player;
 class WorldSession;
+class CreatureGroup;
 
 enum Gossip_Option
 {
@@ -494,6 +494,7 @@ class TRINITY_DLL_SPEC Creature : public Unit
         bool IsInEvadeMode() const;
 
         bool AIM_Initialize(CreatureAI* ai = NULL);
+        void Motion_Initialize();
 
         void AI_SendMoveToPacket(float x, float y, float z, uint32 time, uint32 MovementFlags, uint8 type);
         CreatureAI* AI() { return (CreatureAI*)i_AI; }
@@ -651,8 +652,8 @@ class TRINITY_DLL_SPEC Creature : public Unit
         void UpdateWaypointID(uint32 wpID){m_waypointID = wpID;}
 
         void SearchFormation();
-        bool IsFormationLeader() {return (GetDBTableGUIDLow() && GetDBTableGUIDLow() == m_formationID);}
-        uint32 GetFormationID(){return m_formationID;}
+		CreatureGroup *GetFormation() {return m_formation;}
+		void SetFormation(CreatureGroup *formation) {m_formation = formation;}
 
         Unit *SelectVictim();
         void SetDeadByDefault (bool death_state) {m_isDeadByDefault = death_state;}
@@ -711,7 +712,7 @@ class TRINITY_DLL_SPEC Creature : public Unit
         uint32 m_path_id;
 
         //Formation var
-        uint32 m_formationID;
+        CreatureGroup *m_formation;
 
         GridReference<Creature> m_gridRef;
         CreatureInfo const* m_creatureInfo;                 // in heroic mode can different from ObjMgr::GetCreatureTemplate(GetEntry())
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 24f67ec8901..65e51b793f0 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -25,40 +25,59 @@
 #include "Policies/SingletonImp.h"
 
 #define MAX_DESYNC 5.0f
-//TODO: Create group manager for each map
+
 INSTANTIATE_SINGLETON_1(CreatureGroupManager);
 
-UNORDERED_MAP<uint32, CreatureGroup*> CreatureGroupHolder;
-UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
+CreatureGroupHolderType CreatureGroupHolder;
+CreatureGroupInfoType   CreatureGroupMap;
 
-void CreatureGroupManager::UpdateCreatureGroup(uint32 group_id, Creature *member)
+void CreatureGroupManager::AddCreatureToGroup(uint32 group_id, Creature *member)
 {
-    if(CreatureGroupHolder.find(group_id) != CreatureGroupHolder.end())
-    {
-        sLog.outDebug("Group found: %u, inserting creature GUID: %u", group_id, member->GetGUIDLow());
-        CreatureGroupHolder[group_id]->AddMember(member);
-    }
-    else
+    CreatureGroupHolderType::iterator cgroup_data = CreatureGroupHolder.find(group_id);
+
+    //Add member to an existing group
+    if(cgroup_data != CreatureGroupHolder.end())
     {
-        sLog.outDebug("Group not found: %u. Creating new group.", group_id);
-        CreatureGroup* formation = new CreatureGroup;
-        CreatureGroupHolder[group_id] = formation;
-        formation->AddMember(member);
+        typedef std::multimap<uint32, CreatureGroup *>::iterator multiplegroup;
+        std::pair<multiplegroup, multiplegroup> range = CreatureGroupHolder.equal_range(group_id);
+
+        for(multiplegroup i = range.first; i != range.second; ++i)
+        {
+            if(i->second->getInstanceID() == member->GetInstanceId())
+            {
+                sLog.outDebug("Group found: %u, inserting creature GUID: %u, Group InstanceID %u", group_id, member->GetGUIDLow(), i->second->getInstanceID());
+                i->second->AddMember(member);
+                return;
+            }
+        }
     }
+
+    //Create new group
+    sLog.outDebug("Group not found: %u. Creating new group.", group_id);
+    CreatureGroup* cgroup = new CreatureGroup(group_id, member->GetInstanceId());
+    CreatureGroupHolder.insert(std::make_pair(group_id, cgroup));
+    cgroup->AddMember(member);
 }
 
-void CreatureGroupManager::DestroyGroup(uint32 group_id, uint64 guid)
+void CreatureGroupManager::RemoveCreatureFromGroup(CreatureGroup *formation, Creature *member)
 {
-    if(CreatureGroupHolder.find(group_id) != CreatureGroupHolder.end())
+    sLog.outDebug("Deleting member pointer to GUID: %u from group %u", formation->GetId(), member->GetDBTableGUIDLow());
+    formation->RemoveMember(member);
+
+    if(formation->isEmpty())
     {
-        sLog.outDebug("Deleting member pointer to GUID: %u from group %u", group_id, guid);
-        CreatureGroupHolder[group_id]->RemoveMember(guid);
+        uint32 id = formation->GetId();
+        typedef std::multimap<uint32, CreatureGroup *>::iterator multiplegroup;
+        std::pair<multiplegroup, multiplegroup> range = CreatureGroupHolder.equal_range(id);
 
-        if(CreatureGroupHolder[group_id]->isEmpty())
+        for(multiplegroup i = range.first; i != range.second; ++i)
         {
-            sLog.outDebug("Deleting group %u", group_id);
-            delete CreatureGroupHolder[group_id];
-            CreatureGroupHolder.erase(group_id);
+            if(i->second == formation)
+            {
+                sLog.outDebug("Deleting group with InstanceID %u", i->second->getInstanceID());
+                CreatureGroupHolder.erase(i);
+                delete formation;
+            }
         }
     }
 }
@@ -73,7 +92,7 @@ void CreatureGroupManager::LoadCreatureFormations()
 
     if(!result)
     {
-        sLog.outErrorDb(" an error occured while loading the table `creature_formations` ( maybe it doesn't exist ?)\n");
+        sLog.outErrorDb(" ...an error occured while loading the table `creature_formations` ( maybe it doesn't exist ?)\n");
         return;
     }
     delete result;
@@ -87,11 +106,11 @@ void CreatureGroupManager::LoadCreatureFormations()
         return;
     }
 
-    uint32 total_records = result->GetRowCount();
+    uint32 total_records = result->GetRowCount(), lastLeaderGUID = 0;
     barGoLink bar( total_records);
     Field *fields;
 
-    FormationMember *group_member;
+    FormationInfo *group_member;
     //Loading data...
     do
     {
@@ -99,36 +118,22 @@ void CreatureGroupManager::LoadCreatureFormations()
 
         bar.step();
         //Load group member data
-        group_member                        = new FormationMember;
-        group_member->leaderGUID            = fields[0].GetUInt32();
-        group_member->memberGUID            = fields[1].GetUInt32();
-        group_member->groupAI               = fields[4].GetUInt8();
+        group_member						= new FormationInfo;
+        group_member->leaderGUID			= fields[0].GetUInt32();
+        uint32 memberGUID = fields[1].GetUInt32();
+        group_member->groupAI				= fields[4].GetUInt8();
         //If creature is group leader we may skip loading of dist/angle
-        if(group_member->leaderGUID != group_member->memberGUID)
+        if(group_member->leaderGUID != memberGUID)
         {
-            group_member->follow_dist           = fields[2].GetUInt32();
-            group_member->follow_angle          = fields[3].GetUInt32();
+            group_member->follow_dist			= fields[2].GetUInt32();
+            group_member->follow_angle			= fields[3].GetUInt32();
         }
 
-        // check data correctness
-        {
-            QueryResult* result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", group_member->leaderGUID);
-            if(!result)
-            {
-                sLog.outErrorDb("creature_formations table leader guid %u incorrect (not exist)", group_member->leaderGUID);
-                continue;
-            }
-
-            result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", group_member->memberGUID);
-            if(!result)
-            {
-                sLog.outErrorDb("creature_formations table member guid %u incorrect (not exist)", group_member->memberGUID);
-                continue;
-            }
-        }
+        CreatureGroupMap[memberGUID] = group_member;
 
-        CreatureGroupMap[group_member->memberGUID] = group_member;
-    }
+        if(lastLeaderGUID != group_member->leaderGUID)
+            lastLeaderGUID = group_member->leaderGUID;
+    } 
     while(result->NextRow()) ;
 
     sLog.outString();
@@ -140,90 +145,100 @@ void CreatureGroupManager::LoadCreatureFormations()
 
 void CreatureGroup::AddMember(Creature *member)
 {
-    sLog.outDebug("Adding unit GUID: %u.", member->GetGUIDLow());
+    sLog.outDebug("CreatureGroup::AddMember: Adding unit GUIDLow: %u.", member->GetGUIDLow());
 
-    uint64 guid = member->GetGUID();
-    //We first search creature member if exist
-    if(CreatureGroupMembers.find(guid) != CreatureGroupMembers.end())
-        return;
-    //Check is that shit is a leader
-    if(member->IsFormationLeader())
+    //Check if it is a leader
+    if(member->GetDBTableGUIDLow() == m_groupID)
     {
         sLog.outDebug("Unit GUID: %u is formation leader. Adding group.", member->GetGUIDLow());
         m_leader = member;
     }
-    //Add to the club
-    CreatureGroupMembers[guid] = member;
-    sLog.outDebug("Unit GUID: %u added.", member->GetGUID());
+
+    m_members[member] = CreatureGroupMap.find(member->GetDBTableGUIDLow())->second;
+    member->SetFormation(this);
 }
 
-void CreatureGroup::RemoveMember(uint64 guid)
+void CreatureGroup::RemoveMember(Creature *member)
 {
-    if(CreatureGroupMembers.find(guid) != CreatureGroupMembers.end())
-        CreatureGroupMembers.erase(guid);
+    if(m_leader == member)
+        m_leader = NULL;
+
+    m_members.erase(member);
+    member->SetFormation(NULL);
 }
 
-void CreatureGroup::MemberHasAttacked(Creature *member)
+void CreatureGroup::MemberAttackStart(Creature *member, Unit *target)
 {
-    uint8 groupAI = CreatureGroupMap[member->GetDBTableGUIDLow()]->groupAI;;
+    uint8 groupAI = CreatureGroupMap[member->GetDBTableGUIDLow()]->groupAI;
+    if(!groupAI)
+        return;
 
-    for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); itr++)
+    if(groupAI == 1 && member != m_leader)
+        return;
+
+    for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
-        sLog.outDebug("AI:%u:Group member found: %u, attacked by %s.", groupAI, itr->second->GetGUIDLow(), member->getVictim()->GetName());
-        if(itr->second)
-        {
-            switch(groupAI)
-            {
-                case 0:
-                    return;
-                case 1:
-                    if(!member->IsFormationLeader())
-                        return;
-            }
-            //Attack if everything is OK
-            itr->second->AI()->AttackStart(member->getVictim());
-        }
+        sLog.outDebug("GROUP ATTACK: group instance id %u calls member instid %u", m_leader->GetInstanceId(), member->GetInstanceId());
+        //sLog.outDebug("AI:%u:Group member found: %u, attacked by %s.", groupAI, itr->second->GetGUIDLow(), member->getVictim()->GetName());
+
+        //Skip one check
+        if(itr->first == member)
+            continue;
+
+        if(!itr->first->isAlive())
+            continue;
+
+        if(itr->first->getVictim())
+            continue;
+
+        if(itr->first->canAttack(target))
+            itr->first->AI()->AttackStart(target);
     }
 }
 
-void CreatureGroup::LeaderMovedInEvade()
+void CreatureGroup::FormationReset(bool dismiss)
 {
-    for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); itr++)
+    for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
-        if(itr->second && itr->second->isAlive() && !itr->second->isInCombat() && !itr->second->getVictim())
-            SetMemberDestination(itr->second);
+        if(itr->first != m_leader && itr->first->isAlive())
+        {
+            if(dismiss)
+                itr->first->GetMotionMaster()->Initialize();
+            else
+                itr->first->GetMotionMaster()->MoveIdle(MOTION_SLOT_IDLE);
+            sLog.outDebug("Set %s movement for member GUID: %u", dismiss ? "default" : "idle", itr->first->GetGUIDLow());
+        }
     }
+    m_Formed = !dismiss;
 }
 
-void CreatureGroup::SetMemberDestination(Creature *member)
+void CreatureGroup::LeaderMoveTo(float x, float y, float z)
 {
-    if(!member || !m_leader || member->IsFormationLeader())
+    if(!m_leader)
         return;
 
-    float x,y,z;
-    uint32 lowguid = member->GetDBTableGUIDLow();
-
-    UNORDERED_MAP<uint32, FormationMember*>::iterator itr2 = CreatureGroupMap.find(lowguid);
+    float pathangle	= atan2(m_leader->GetPositionY() - y, m_leader->GetPositionX() - x);
 
-    if(m_leader->GetMotionMaster()->GetDestination(x,y,z) && itr2 != CreatureGroupMap.end())
+    for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
-        float dist, angle, pathangle;
+        Creature *member = itr->first;
+        if(member == m_leader || !member->isAlive() || member->getVictim())
+            continue;
 
-        angle       = CreatureGroupMap[lowguid]->follow_angle;
-        dist        = CreatureGroupMap[lowguid]->follow_dist;
-        pathangle   = atan2(m_leader->GetPositionY()-y, m_leader->GetPositionX()-x);
+        float angle = itr->second->follow_angle;
+        float dist = itr->second->follow_dist;	
 
-        x = x+cos(angle+pathangle)*dist;
-        y = y+sin(angle+pathangle)*dist;
+        float dx = x + cos(angle + pathangle) * dist;
+        float dy = y + sin(angle + pathangle) * dist;
+        float dz;
+        member->UpdateGroundPositionZ(dx, dy, dz);
 
-        member->GetMotionMaster()->Clear();
-
-        if(member->GetDistance(m_leader) < dist+MAX_DESYNC)
+        if(member->GetDistance(m_leader) < dist + MAX_DESYNC)
             member->SetUnitMovementFlags(m_leader->GetUnitMovementFlags());
         else
             member->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
 
-        member->GetMotionMaster()->MovePoint(0, x, y, z);
+        member->GetMotionMaster()->MovePoint(0, dx, dy, dz);
+        member->SetHomePosition(dx, dy, dz, pathangle);
     }
 }
-
diff --git a/src/game/CreatureGroups.h b/src/game/CreatureGroups.h
index 11d45167fd9..1f7e5d97ce3 100644
--- a/src/game/CreatureGroups.h
+++ b/src/game/CreatureGroups.h
@@ -1,7 +1,7 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
+/* 
+ * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
  *
- * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
+ * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,49 +21,61 @@
 #ifndef _FORMATIONS_H
 #define _FORMATIONS_H
 
-#include <map>
-#include "Creature.h"
-#include "Policies/Singleton.h"
+#include "Common.h"
 
-struct FormationMember
+class CreatureGroup;
+
+struct FormationInfo
 {
-    float follow_dist;
-    float follow_angle;
-    uint32 memberGUID;
-    uint32 leaderGUID;
+	uint32 leaderGUID;
+	float follow_dist; 
+	float follow_angle; 
     uint8 groupAI;
 };
 
 class CreatureGroupManager
 {
-    public:
-        void UpdateCreatureGroup(uint32 group_id, Creature *member);
-        void DestroyGroup(uint32 group_id, uint64 guid);
-        void LoadCreatureFormations();
+	public:
+        void AddCreatureToGroup(uint32 group_id, Creature *creature);
+        void RemoveCreatureFromGroup(CreatureGroup *group, Creature *creature);
+		void LoadCreatureFormations();
 };
 
+typedef std::multimap<uint32/*leaderDBGUID*/, CreatureGroup*>   CreatureGroupHolderType;
+typedef UNORDERED_MAP<uint32/*memberDBGUID*/, FormationInfo*>   CreatureGroupInfoType;
+
+extern CreatureGroupHolderType  CreatureGroupHolder;
+extern CreatureGroupInfoType    CreatureGroupMap;
+
 class CreatureGroup
 {
-    UNORDERED_MAP<uint64, Creature*>CreatureGroupMembers;
-    Creature *m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D
+    private:
+	    Creature *m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D
+        typedef std::map<Creature*, FormationInfo*>  CreatureGroupMemberType;
+	    CreatureGroupMemberType m_members;
 
-    public:
-        CreatureGroup() : m_leader(NULL) {}
-        ~CreatureGroup(){sLog.outDebug("Destroying group");}
-        void AddMember(Creature *);
-        void RemoveMember(uint64 guid);
-        void LeaderMovedInEvade();
-        void MemberHasAttacked(Creature *);
-        void SetMemberDestination(Creature *);
-        bool isEmpty() {return CreatureGroupMembers.empty();}
-};
+	    uint32 m_groupID, mInstanceID;
+	    bool m_Formed;
+	
+	public:
+        //Group cannot be created empty
+		explicit CreatureGroup(uint32 id, uint32 InstanceID) : m_groupID(id), m_leader(NULL), mInstanceID(InstanceID), m_Formed(false) {}
+		~CreatureGroup(){sLog.outDebug("Destroying group");}
+		
+		Creature* getLeader() const { return m_leader; }
+		uint32 GetId() const { return m_groupID; }
+		uint32 getInstanceID() const { return mInstanceID; }
+		bool isEmpty() const { return m_members.empty(); }
+		bool isFormed() const { return m_Formed; }
 
-typedef UNORDERED_MAP<uint32, CreatureGroup*> CreatureGroupHolderType;
+		void AddMember(Creature *member);
+		void RemoveMember(Creature *member);
+		void FormationReset(bool dismiss);
 
-extern CreatureGroupHolderType CreatureGroupHolder;
-extern UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
+		void LeaderMoveTo(float x, float y, float z);
+		void MemberAttackStart(Creature* member, Unit *target);
+};
 
 #define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance()
 
 #endif
-
diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/HomeMovementGenerator.cpp
index 0adacb57836..eee10c6fbb2 100644
--- a/src/game/HomeMovementGenerator.cpp
+++ b/src/game/HomeMovementGenerator.cpp
@@ -69,7 +69,8 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff
         // restore orientation of not moving creature at returning to home
         if(owner.GetDefaultMovementType()==IDLE_MOTION_TYPE)
         {
-            owner.SetOrientation(ori);
+            sLog.outDebug("Entering HomeMovement::GetDestination(z,y,z)");
+			owner.SetOrientation(ori);
             WorldPacket packet;
             owner.BuildHeartBeatMsg(&packet);
             owner.SendMessageToSet(&packet, false);
diff --git a/src/game/HomeMovementGenerator.h b/src/game/HomeMovementGenerator.h
index 3e3a59456cd..b89bc3fbcb1 100644
--- a/src/game/HomeMovementGenerator.h
+++ b/src/game/HomeMovementGenerator.h
@@ -47,7 +47,8 @@ class TRINITY_DLL_SPEC HomeMovementGenerator<Creature>
         MovementGeneratorType GetMovementGeneratorType() { return HOME_MOTION_TYPE; }
 
         bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; }
-    private:
+    
+	private:
         void _setTargetLocation(Creature &);
         DestinationHolder< Traveller<Creature> > i_destinationHolder;
 
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index d1f4c864f24..956a9d92549 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -44,6 +44,7 @@
 #include "GlobalEvents.h"
 
 #include "TargetedMovementGenerator.h"                      // for HandleNpcUnFollowCommand
+#include "CreatureGroups.h"
 
 static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
 {
@@ -4569,9 +4570,9 @@ bool ChatHandler::HandleNpcAddFormationCommand(const char* args)
     }
 
     uint32 lowguid = pCreature->GetDBTableGUIDLow();
-    if(pCreature->GetFormationID())
+	if(pCreature->GetFormation())
     {
-        PSendSysMessage("Selected creature is already member of group %u", pCreature->GetFormationID());
+		PSendSysMessage("Selected creature is already member of group %u", pCreature->GetFormation()->GetId());
         return false;
     }
 
@@ -4579,12 +4580,11 @@ bool ChatHandler::HandleNpcAddFormationCommand(const char* args)
         return false;
 
     Player *chr = m_session->GetPlayer();
-    FormationMember *group_member;
+    FormationInfo *group_member;
 
-    group_member                 = new FormationMember;
+    group_member                 = new FormationInfo;
     group_member->follow_angle   = pCreature->GetAngle(chr) - chr->GetOrientation();
     group_member->follow_dist    = sqrtf(pow(chr->GetPositionX() - pCreature->GetPositionX(),int(2))+pow(chr->GetPositionY()-pCreature->GetPositionY(),int(2)));
-    group_member->memberGUID     = lowguid;
     group_member->leaderGUID     = leaderGUID;
     group_member->groupAI        = 0;
 
diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp
index 6dcf2d0e214..d4199c2099e 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -525,9 +525,9 @@ void MotionMaster::DelayedDelete(_Ty curr)
 
 bool MotionMaster::GetDestination(float &x, float &y, float &z)
 {
-   if(empty())
+	if(empty())
        return false;
-
-   return top()->GetDestination(x,y,z);
+	
+	return top()->GetDestination(x,y,z);
 }
 
diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h
index 864c58b3b7b..38a2b58825f 100644
--- a/src/game/MotionMaster.h
+++ b/src/game/MotionMaster.h
@@ -76,7 +76,7 @@ class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *>
         typedef std::vector<_Ty> ExpireList;
         int i_top;
 
-        bool empty() const { return i_top < 0; }
+        bool empty() const { return (i_top < 0); }
         void pop() { Impl[i_top] = NULL; --i_top; }
         void push(_Ty _Val) { ++i_top; Impl[i_top] = _Val; }
 
diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp
index 3e4912d00cd..763e7f12c5a 100644
--- a/src/game/RandomMovementGenerator.cpp
+++ b/src/game/RandomMovementGenerator.cpp
@@ -26,6 +26,7 @@
 #include "DestinationHolderImp.h"
 #include "Map.h"
 #include "Util.h"
+#include "CreatureGroups.h"
 
 #define RUNNING_CHANCE_RANDOMMV 20                                  //will be "1 / RUNNING_CHANCE_RANDOMMV"
 
@@ -114,6 +115,12 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)
         i_nextMoveTime.Reset(urand(500+i_destinationHolder.GetTotalTravelTime(),5000+i_destinationHolder.GetTotalTravelTime()));
         creature.SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
     }
+
+    //Call for creature group update
+	if(creature.GetFormation() && creature.GetFormation()->getLeader() == &creature)
+	{
+        creature.GetFormation()->LeaderMoveTo(nx, ny, nz);
+	}
 }
 
 template<>
diff --git a/src/game/Traveller.h b/src/game/Traveller.h
index f654b0c297e..702cc6413b0 100644
--- a/src/game/Traveller.h
+++ b/src/game/Traveller.h
@@ -24,7 +24,6 @@
 #include "Creature.h"
 #include "Player.h"
 #include <cassert>
-#include "CreatureGroups.h"
 
 /** Traveller is a wrapper for units (creatures or players) that
  * travel from point A to point B using the destination holder.
@@ -109,11 +108,6 @@ inline float Traveller<Creature>::GetMoveDestinationTo(float x, float y, float z
 template<>
 inline void Traveller<Creature>::MoveTo(float x, float y, float z, uint32 t)
 {
-    //Call for creature group update
-    if(i_traveller.IsFormationLeader() && !i_traveller.isInCombat() &&
-        CreatureGroupHolder.find(i_traveller.GetFormationID()) != CreatureGroupHolder.end())
-        CreatureGroupHolder[i_traveller.GetFormationID()]->LeaderMovedInEvade();
-
     //i_traveller.AI_SendMoveToPacket(x, y, z, t, i_traveller.GetUnitMovementFlags(), 0);
     i_traveller.SendMonsterMove(x, y, z, t);
 }
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 06b4313dcbf..10694d1de2b 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -9541,7 +9541,14 @@ void Unit::CombatStart(Unit* target)
 
     if(!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER
         && !((Creature*)target)->HasReactState(REACT_PASSIVE) && ((Creature*)target)->IsAIEnabled)
+    {
         ((Creature*)target)->AI()->AttackStart(this);
+        if(((Creature*)target)->GetFormation())
+	    {
+		    ((Creature*)target)->GetFormation()->MemberAttackStart((Creature*)target, this);
+		    sLog.outDebug("Unit::CombatStart() calls CreatureGroups::MemberHasAttacked(this);");
+	    }
+    }
 
     SetInCombatWith(target);
     target->SetInCombatWith(this);
@@ -9558,14 +9565,6 @@ void Unit::CombatStart(Unit* target)
         me->UpdatePvP(true);
         me->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
     }
-
-    //Call creature group update
-    if(GetTypeId()==TYPEID_UNIT && ((Creature*)this)->GetFormationID())
-    {
-        CreatureGroupHolderType::iterator itr = CreatureGroupHolder.find(((Creature*)this)->GetFormationID());
-        if(itr != CreatureGroupHolder.end())
-           itr->second->MemberHasAttacked(((Creature*)this));
-    }
 }
 
 void Unit::SetInCombatState(bool PvP)
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index fd2b0b8bb86..c6607b2b24e 100644
--- a/src/game/WaypointMovementGenerator.cpp
+++ b/src/game/WaypointMovementGenerator.cpp
@@ -24,6 +24,7 @@
 //Creature-specific headers
 #include "Creature.h"
 #include "CreatureAI.h"
+#include "CreatureGroups.h"
 //Player-specific
 #include "Player.h"
 
@@ -52,9 +53,9 @@ void WaypointMovementGenerator<Creature>::MovementInform(Creature &unit)
 template<>
 bool WaypointMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const
 {
-    if(i_destinationHolder.HasArrived())
+	if(i_destinationHolder.HasArrived())
         return false;
-
+	
     i_destinationHolder.GetDestination(x, y, z);
     return true;
 }
@@ -109,6 +110,10 @@ WaypointMovementGenerator<Creature>::Initialize(Creature &u)
         InitTraveller(u, *node);
         i_destinationHolder.SetDestination(traveller, node->x, node->y, node->z);
         i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime());
+
+        //Call for creature group update
+	    if(u.GetFormation() && u.GetFormation()->getLeader() == &u)
+            u.GetFormation()->LeaderMoveTo(node->x, node->y, node->z);
     }
     else
         node = NULL;
@@ -180,6 +185,10 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
             InitTraveller(unit, *node);
             i_destinationHolder.SetDestination(traveller, node->x, node->y, node->z);
             i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime());
+
+            //Call for creature group update
+	        if(unit.GetFormation() && unit.GetFormation()->getLeader() == &unit)
+                unit.GetFormation()->LeaderMoveTo(node->x, node->y, node->z);
         }
         else
         {