aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel.silva305@gmail.com>2015-03-19 11:12:51 +0100
committerNaios <naios-dev@live.de>2015-03-19 11:14:02 +0100
commitb3a279b6abd2325bb0ebb2c1b2818001679f5c7e (patch)
tree87ebcb8f1e2bc87b1a994e9b1c91373ec4b7c8d2 /src
parent2abcd4ef4625a9d06337a4ca91afb42d7d43becd (diff)
Split up LANG_MAP_POSITION to fix a crash when issuing .gps command
Conflicts: src/server/game/Miscellaneous/Language.h (cherry picked from commit 461daadcaf0cafa410c740e6376090c27a1df8ff)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Miscellaneous/Language.h4
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h
index 446ee2606e1..0e89c3f7a0d 100644
--- a/src/server/game/Miscellaneous/Language.h
+++ b/src/server/game/Miscellaneous/Language.h
@@ -215,7 +215,9 @@ enum TrinityStrings
LANG_PHASING_PHASEMASK = 182,
LANG_PHASING_REPORT_STATUS = 183,
LANG_PHASING_NO_DEFINITIONS = 184, // Phasing
- // Room for more level 1 185-199 not used
+
+ LANG_GRID_POSITION = 185,
+ // Room for more level 1 186-199 not used
// level 2 chat
LANG_NO_SELECTION = 200,
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index bc8f7bad5fb..cf1bc4fbb0e 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -238,7 +238,8 @@ public:
zoneId, (zoneEntry ? zoneEntry->ZoneName : unknown),
areaId, (areaEntry ? areaEntry->ZoneName : unknown),
object->GetPhaseMask(),
- object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation(),
+ object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation());
+ handler->PSendSysMessage(LANG_GRID_POSITION,
cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), object->GetInstanceId(),
zoneX, zoneY, groundZ, floorZ, haveMap, haveVMap, haveMMap);