1 files changed, 124 insertions, 87 deletions

diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 55b56e0b94e..3b7a27cdab5 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
- * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2009 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
@@ -23,43 +23,52 @@
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "Policies/SingletonImp.h"
+#include "CreatureAI.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;
+CreatureGroupInfoType   CreatureGroupMap;
 
-void CreatureGroupManager::UpdateCreatureGroup(uint32 group_id, Creature *member)
+void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature *member)
 {
-    if(CreatureGroupHolder.find(group_id) != CreatureGroupHolder.end())
+    Map *map = member->FindMap();
+    if(!map)
+        return;
+
+    CreatureGroupHolderType::iterator itr = map->CreatureGroupHolder.find(groupId);
+
+    //Add member to an existing group
+    if(itr != map->CreatureGroupHolder.end())
     {
-        sLog.outDebug("Group found: %u, inserting creature GUID: %u", group_id, member->GetGUIDLow());
-        CreatureGroupHolder[group_id]->AddMember(member);
+        sLog.outDebug("Group found: %u, inserting creature GUID: %u, Group InstanceID %u", groupId, member->GetGUIDLow(), member->GetInstanceId());
+        itr->second->AddMember(member);
     }
+    //Create new group
     else
     {
-        sLog.outDebug("Group not found: %u. Creating new group.", group_id);
-        CreatureGroup* formation = new CreatureGroup;
-        CreatureGroupHolder[group_id] = formation;
-        formation->AddMember(member);
+        sLog.outDebug("Group not found: %u. Creating new group.", groupId);
+        CreatureGroup* group = new CreatureGroup(groupId);
+        map->CreatureGroupHolder[groupId] = group;
+        group->AddMember(member);
     }
 }
 
-void CreatureGroupManager::DestroyGroup(uint32 group_id, uint64 guid)
+void CreatureGroupManager::RemoveCreatureFromGroup(CreatureGroup *group, Creature *member)
 {
-    if(CreatureGroupHolder.find(group_id) != CreatureGroupHolder.end())
+    sLog.outDebug("Deleting member pointer to GUID: %u from group %u", group->GetId(), member->GetDBTableGUIDLow());
+    group->RemoveMember(member);
+
+    if(group->isEmpty())
     {
-        sLog.outDebug("Deleting member pointer to GUID: %u from group %u", group_id, guid);
-        CreatureGroupHolder[group_id]->RemoveMember(guid);
+        Map *map = member->FindMap();
+        if(!map)
+            return;
 
-        if(CreatureGroupHolder[group_id]->isEmpty())
-        {
-            sLog.outDebug("Deleting group %u", group_id);
-            delete CreatureGroupHolder[group_id];
-            CreatureGroupHolder.erase(group_id);
-        }
+        sLog.outDebug("Deleting group with InstanceID %u", member->GetInstanceId());
+        map->CreatureGroupHolder.erase(group->GetId());
+        delete group;
     }
 }
 
@@ -73,7 +82,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 +96,11 @@ void CreatureGroupManager::LoadCreatureFormations()
         return;
     }
 
-    uint32 total_records = result->GetRowCount(), lastLeaderGUID = 0;
+    uint32 total_records = result->GetRowCount();
     barGoLink bar( total_records);
     Field *fields;
 
-    FormationMember *group_member;
+    FormationInfo *group_member;
     //Loading data...
     do
     {
@@ -99,22 +108,36 @@ void CreatureGroupManager::LoadCreatureFormations()
 
         bar.step();
         //Load group member data
-        group_member                        = new FormationMember;
+        group_member                        = new FormationInfo;
         group_member->leaderGUID            = fields[0].GetUInt32();
-        group_member->memberGUID            = fields[1].GetUInt32();
-        group_member->groupAI               = fields[4].GetUInt8();
+        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();
         }
 
-        CreatureGroupMap[group_member->memberGUID] = group_member;
+        // 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;
+            }
 
-        if(lastLeaderGUID != group_member->leaderGUID)
-            lastLeaderGUID = group_member->leaderGUID;
-    }
+            result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", memberGUID);
+            if(!result)
+            {
+                sLog.outErrorDb("creature_formations table member guid %u incorrect (not exist)", memberGUID);
+                continue;
+            }
+        }
+
+        CreatureGroupMap[memberGUID] = group_member;
+    } 
     while(result->NextRow()) ;
 
     sLog.outString();
@@ -126,90 +149,104 @@ 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 = z;
 
-        member->GetMotionMaster()->Clear();
+        Trinity::NormalizeMapCoord(dx);
+        Trinity::NormalizeMapCoord(dy);
 
-        if(member->GetDistance(m_leader) < dist+MAX_DESYNC)
+        member->UpdateGroundPositionZ(dx, dy, dz);
+
+        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);
     }
 }
-