aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-05-16 22:16:21 +0200
committerShauren <shauren.trinity@gmail.com>2017-05-16 22:16:21 +0200
commita12a34b1dce93b17dcb2978937ac00288949ae13 (patch)
tree81dc0776fe697795169497ec213f3790459b6095 /src/server/game/Globals/ObjectMgr.cpp
parentb421a5c0cbaf8acd8f1152c96ad7872cb8d7c9e3 (diff)
Core/Game: Include cleanup - removed G3D classes from packets
* Use our own Position class instead, with the coords written to packets being part of type
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 870b378cb66..77696912612 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -7518,16 +7518,15 @@ void ObjectMgr::LoadPointsOfInterest()
PointOfInterest pointOfInterest;
pointOfInterest.ID = id;
- pointOfInterest.Pos.x = fields[1].GetFloat();
- pointOfInterest.Pos.y = fields[2].GetFloat();
+ pointOfInterest.Pos.Relocate(fields[1].GetFloat(), fields[2].GetFloat());
pointOfInterest.Icon = fields[3].GetUInt32();
pointOfInterest.Flags = fields[4].GetUInt32();
pointOfInterest.Importance = fields[5].GetUInt32();
pointOfInterest.Name = fields[6].GetString();
- if (!Trinity::IsValidMapCoord(pointOfInterest.Pos.x, pointOfInterest.Pos.y))
+ if (!Trinity::IsValidMapCoord(pointOfInterest.Pos.GetPositionX(), pointOfInterest.Pos.GetPositionY()))
{
- TC_LOG_ERROR("sql.sql", "Table `points_of_interest` (ID: %u) have invalid coordinates (PositionX: %f PositionY: %f), ignored.", id, pointOfInterest.Pos.x, pointOfInterest.Pos.y);
+ TC_LOG_ERROR("sql.sql", "Table `points_of_interest` (ID: %u) have invalid coordinates (PositionX: %f PositionY: %f), ignored.", id, pointOfInterest.Pos.GetPositionX(), pointOfInterest.Pos.GetPositionY());
continue;
}