aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/game/Creature.cpp65
-rw-r--r--src/game/Creature.h3
-rw-r--r--src/game/CreatureGroups.cpp178
-rw-r--r--src/game/CreatureGroups.h57
-rw-r--r--src/game/Level2.cpp6
-rw-r--r--src/game/MotionMaster.cpp2
-rw-r--r--src/game/RandomMovementGenerator.cpp7
-rw-r--r--src/game/Traveller.h8
-rw-r--r--src/game/Unit.cpp14
-rw-r--r--src/game/WaypointMovementGenerator.cpp9
10 files changed, 161 insertions, 188 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 081d267e6b6..837a45942ab 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -174,24 +174,18 @@ void Creature::AddToWorld()
{
ObjectAccessor::Instance().AddObject(this);
Unit::AddToWorld();
- AIM_Initialize();
SearchFormation();
+ AIM_Initialize();
}
}
void Creature::RemoveFromWorld()
{
-
- // Clear formation info
- if(m_formation)
- {
- formation_mgr.DestroyGroup(m_formation, GetGUID());
- m_formation = NULL;
- }
-
- ///- Remove the creature from the accessor
if(IsInWorld())
{
+ // Clear formation info
+ if(m_formation)
+ formation_mgr.RemoveCreatureFromGroup(m_formation, this);
Unit::RemoveFromWorld();
ObjectAccessor::Instance().RemoveObject(this);
}
@@ -199,19 +193,16 @@ void Creature::RemoveFromWorld()
void Creature::SearchFormation()
{
- if(isPet())
+ if(isSummon())
return;
uint32 lowguid = GetDBTableGUIDLow();
if(!lowguid)
return;
- UNORDERED_MAP<uint32, FormationMember *>::iterator frmdata = CreatureGroupMap.find(lowguid);
+ CreatureGroupInfoType::iterator frmdata = CreatureGroupMap.find(lowguid);
if(frmdata != CreatureGroupMap.end())
- {
- uint32 formationID = frmdata->second->leaderGUID;
- formation_mgr.UpdateCreatureGroup(formationID, *this);
- }
+ formation_mgr.AddCreatureToGroup(frmdata->second->leaderGUID, this);
}
void Creature::RemoveCorpse()
@@ -620,22 +611,29 @@ bool Creature::AIM_Initialize(CreatureAI* ai)
}
UnitAI *oldAI = i_AI;
+
+ Motion_Initialize();
+ i_AI = ai ? ai : FactorySelector::selectAI(this);
+ if(oldAI) delete oldAI;
+ IsAIEnabled = true;
+ i_AI->Reset();
+ return true;
+}
+
+void Creature::Motion_Initialize()
+{
if(!m_formation)
i_motionMaster.Initialize();
else if(m_formation->getLeader() == this)
{
- m_formation->FormDismiss();
+ m_formation->FormationReset(false);
i_motionMaster.Initialize();
}
- else
- m_formation->isFormed() ? i_motionMaster.MoveIdle(MOTION_SLOT_IDLE) : i_motionMaster.Initialize();
-
- i_AI = ai ? ai : FactorySelector::selectAI(this);
- if(oldAI) delete oldAI;
- IsAIEnabled = true;
- i_AI->Reset();
- return true;
+ 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)
@@ -1676,7 +1674,7 @@ void Creature::setDeathState(DeathState s)
//Dismiss group if is leader
if(m_formation && m_formation->getLeader() == this)
- m_formation->FormDismiss(true);
+ m_formation->FormationReset(true);
}
if(s == JUST_ALIVED)
{
@@ -1690,22 +1688,9 @@ 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);
- /////////////////////!!!!!!!!!!!!!!!!!!!!
- if(!m_formation)
- i_motionMaster.Initialize();
- else
- {
- if(m_formation->getLeader() == this)
- {
- m_formation->FormDismiss(false);
- i_motionMaster.Initialize();
- }
- else
- m_formation->isFormed() ? i_motionMaster.MoveIdle(MOTION_SLOT_IDLE) : i_motionMaster.Initialize();
- }
+ Motion_Initialize();
}
}
diff --git a/src/game/Creature.h b/src/game/Creature.h
index bce132f0cd0..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; }
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index c8e31811594..65e51b793f0 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -29,12 +29,13 @@
INSTANTIATE_SINGLETON_1(CreatureGroupManager);
CreatureGroupHolderType CreatureGroupHolder;
-UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
+CreatureGroupInfoType CreatureGroupMap;
-void CreatureGroupManager::UpdateCreatureGroup(uint32 group_id, Creature &member)
+void CreatureGroupManager::AddCreatureToGroup(uint32 group_id, Creature *member)
{
- std::multimap<uint32, CreatureGroup *>::iterator cgroup_data = CreatureGroupHolder.find(group_id);
+ CreatureGroupHolderType::iterator cgroup_data = CreatureGroupHolder.find(group_id);
+ //Add member to an existing group
if(cgroup_data != CreatureGroupHolder.end())
{
typedef std::multimap<uint32, CreatureGroup *>::iterator multiplegroup;
@@ -42,28 +43,26 @@ void CreatureGroupManager::UpdateCreatureGroup(uint32 group_id, Creature &member
for(multiplegroup i = range.first; i != range.second; ++i)
{
- if(i->second->getInstanceID() == member.GetInstanceId())
+ 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());
+ 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());
- cgroup->AddMember(member);
+ CreatureGroup* cgroup = new CreatureGroup(group_id, member->GetInstanceId());
CreatureGroupHolder.insert(std::make_pair(group_id, cgroup));
+ cgroup->AddMember(member);
}
-void CreatureGroupManager::DestroyGroup(CreatureGroup *&formation, uint64 guid)
+void CreatureGroupManager::RemoveCreatureFromGroup(CreatureGroup *formation, Creature *member)
{
- if(!formation || !guid)
- return;
-
- sLog.outDebug("Deleting member pointer to GUID: %u from group %u", formation->GetId(), guid);
- formation->RemoveMember(guid);
+ sLog.outDebug("Deleting member pointer to GUID: %u from group %u", formation->GetId(), member->GetDBTableGUIDLow());
+ formation->RemoveMember(member);
if(formation->isEmpty())
{
@@ -111,7 +110,7 @@ void CreatureGroupManager::LoadCreatureFormations()
barGoLink bar( total_records);
Field *fields;
- FormationMember *group_member;
+ FormationInfo *group_member;
//Loading data...
do
{
@@ -119,18 +118,18 @@ 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();
+ 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();
}
- CreatureGroupMap[group_member->memberGUID] = group_member;
+ CreatureGroupMap[memberGUID] = group_member;
if(lastLeaderGUID != group_member->leaderGUID)
lastLeaderGUID = group_member->leaderGUID;
@@ -144,123 +143,102 @@ void CreatureGroupManager::LoadCreatureFormations()
delete result;
}
-void CreatureGroup::AddMember(Creature &member)
+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.GetDBTableGUIDLow()==m_groupID)
- {
- sLog.outDebug("Unit GUID: %u is formation leader. Adding group.", member.GetGUIDLow());
- m_leader = &member;
- }
- else
- {
- sLog.outDebug("Unit GUID: %u is NOT a formation leader. Set IDLE as default movement.", member.GetGUIDLow());
- member.GetMotionMaster()->MoveIdle(MOTION_SLOT_IDLE);
+ //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;
- member.SetFormation(this);
- 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("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());
+ 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());
- if(itr->second)
- {
- //Skip one check
- if(itr->second == &member)
- return;
+ //Skip one check
+ if(itr->first == member)
+ continue;
- switch(groupAI)
- {
- case 0:
- return;
- case 1:
- if(&member != m_leader)
- return;
- }
- //Attack if everything is OK
- if(itr->second->isAlive() && itr->second->AI() && !itr->second->isInCombat() &&
- !itr->second->getVictim() && member.getVictim() && itr->second->canAttack(member.getVictim()))
- itr->second->AI()->AttackStart(member.getVictim());
- }
- }
-}
+ if(!itr->first->isAlive())
+ continue;
-void CreatureGroup::LeaderMovedInEvade()
-{
- for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); ++itr)
- {
- if(itr->second && itr->second != m_leader && itr->second->isAlive() && !itr->second->isInCombat() && !itr->second->getVictim())
- {
- SetMemberDestination(itr->second);
- sLog.outDebug("GROUP MOVE IN EVADE: Set destination for member GUID %u", itr->second->GetGUIDLow());
- }
+ if(itr->first->getVictim())
+ continue;
+
+ if(itr->first->canAttack(target))
+ itr->first->AI()->AttackStart(target);
}
}
-void CreatureGroup::FormDismiss(bool dismiss)
+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 != m_leader && itr->second->isAlive())
+ if(itr->first != m_leader && itr->first->isAlive())
{
- dismiss ? itr->second->GetMotionMaster()->Initialize() : itr->second->GetMotionMaster()->MoveIdle(MOTION_SLOT_IDLE);
- sLog.outDebug("Set %s movement for member GUID: %u", dismiss ? "default" : "idle", itr->second->GetGUIDLow());
+ 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->isAlive() || member->isInCombat() || member->getVictim())
+ if(!m_leader)
return;
- sLog.outDebug("GROUP MOVE IN EVADE: leader instid %u set destination of member instid %u", m_leader->GetInstanceId(), member->GetInstanceId());
+ float pathangle = atan2(m_leader->GetPositionY() - y, m_leader->GetPositionX() - x);
- float x,y,z;
- uint32 lowguid = member->GetDBTableGUIDLow();
-
- UNORDERED_MAP<uint32, FormationMember*>::iterator itr2 = CreatureGroupMap.find(lowguid);
-
- if(itr2 != CreatureGroupMap.end() && m_leader->GetMotionMaster()->GetDestination(x,y,z))
- {
- float dist, angle, pathangle;
+ for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
+ {
+ Creature *member = itr->first;
+ if(member == m_leader || !member->isAlive() || member->getVictim())
+ continue;
- angle = itr2->second->follow_angle;
- dist = itr2->second->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);
- 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()->Clear();
- member->GetMotionMaster()->MovePoint(0, x, y, z);
- member->SetHomePosition(x, y, z, pathangle);
+ 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 9c26fa3a2af..1f7e5d97ce3 100644
--- a/src/game/CreatureGroups.h
+++ b/src/game/CreatureGroups.h
@@ -21,59 +21,60 @@
#ifndef _FORMATIONS_H
#define _FORMATIONS_H
-//#include <map>
-//#include "Creature.h"
-//#include "Policies/Singleton.h"
#include "Common.h"
class CreatureGroup;
-struct FormationMember
+struct FormationInfo
{
+ uint32 leaderGUID;
float follow_dist;
float follow_angle;
- uint32 memberGUID;
- uint32 leaderGUID;
- uint8 groupAI;
+ uint8 groupAI;
};
class CreatureGroupManager
{
public:
- void UpdateCreatureGroup(uint32 group_id, Creature &);
- void DestroyGroup(CreatureGroup *&, uint64 guid);
+ 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
- uint32 m_groupID, mInstanceID;
- bool m_Formed;
+ 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;
+
+ 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(){return m_leader;}
- uint32 GetId(){return m_groupID;}
- uint32 getInstanceID(){return mInstanceID;}
- void AddMember(Creature &);
- void RemoveMember(uint64 guid);
- void FormDismiss(bool dismiss=false);
- void LeaderMovedInEvade();
- void MemberHasAttacked(Creature &);
- void SetMemberDestination(Creature *);
- bool isEmpty() {return CreatureGroupMembers.empty();}
- bool isFormed() {return m_Formed;}
-};
+ 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 std::multimap<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()
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index 823c8b8e9ee..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] =
{
@@ -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 7e2c25d7433..d4199c2099e 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -525,7 +525,7 @@ void MotionMaster::DelayedDelete(_Ty curr)
bool MotionMaster::GetDestination(float &x, float &y, float &z)
{
- if(empty() || !Impl[i_top] || isStatic(Impl[i_top]))
+ if(empty())
return false;
return top()->GetDestination(x,y,z);
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 f630896408c..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,13 +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.GetFormation() && i_traveller.GetFormation()->getLeader() == &i_traveller && !i_traveller.isInCombat())
- {
- i_traveller.GetFormation()->LeaderMovedInEvade();
- sLog.outDebug("Traveller<Creature>::MoveTo(){GUID %u calls LeaderMovedInEvade()}", i_traveller.GetGUIDLow());
- }
-
//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 973b2a7ea35..d2e7a1b4188 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -9537,7 +9537,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);
@@ -9554,13 +9561,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)->GetFormation())
- {
- ((Creature*)this)->GetFormation()->MemberHasAttacked(*(Creature*)this);
- sLog.outDebug("Unit::CombatStart() calls CreatureGroups::MemberHasAttacked(this);");
- }
}
void Unit::SetInCombatState(bool PvP)
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index aae6eacc9c6..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"
@@ -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
{