diff options
Diffstat (limited to 'src/game/Level2.cpp')
| -rw-r--r-- | src/game/Level2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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; |