aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-17 17:29:25 -0500
committermegamage <none@none>2009-05-17 17:29:25 -0500
commit5f023f64f319fc8375a5f3fe29f2297187992b0b (patch)
treea46c3bf0e0c4d9286d208398e35d7b8d1ec1b822 /src
parent1c134f81e38137bbfb1c6925a3a42d9628571d4c (diff)
*Use degree rather than radian for creature_formation table.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/CreatureGroups.cpp4
-rw-r--r--src/game/Level2.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 3b7a27cdab5..45e1c7ee11c 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -115,8 +115,8 @@ void CreatureGroupManager::LoadCreatureFormations()
//If creature is group leader we may skip loading of dist/angle
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].GetFloat();
+ group_member->follow_angle = fields[3].GetFloat() * M_PI / 180;
}
// check data correctness
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index 212b5eaf98e..6591c24629b 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -4506,7 +4506,7 @@ bool ChatHandler::HandleNpcAddFormationCommand(const char* args)
FormationInfo *group_member;
group_member = new FormationInfo;
- group_member->follow_angle = pCreature->GetAngle(chr) - chr->GetOrientation();
+ group_member->follow_angle = (pCreature->GetAngle(chr) - chr->GetOrientation()) * 180 / M_PI;
group_member->follow_dist = sqrtf(pow(chr->GetPositionX() - pCreature->GetPositionX(),int(2))+pow(chr->GetPositionY()-pCreature->GetPositionY(),int(2)));
group_member->leaderGUID = leaderGUID;
group_member->groupAI = 0;