From f42e6647e494745da60bc480acbc4ed2bb8cd31e Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 18 Oct 2015 03:55:14 +0200 Subject: [PATCH] Core/Commands: Added transport position for command .gps (cherry picked from commit 9c99a1d0c7d802fdaf8f944f73aa7eb2a6560950) --- sql/updates/world/2016_03_12_2015_11_14_00_world.sql | 3 +++ src/server/game/Miscellaneous/Language.h | 4 +++- src/server/scripts/Commands/cs_misc.cpp | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2016_03_12_2015_11_14_00_world.sql diff --git a/sql/updates/world/2016_03_12_2015_11_14_00_world.sql b/sql/updates/world/2016_03_12_2015_11_14_00_world.sql new file mode 100644 index 00000000000..b3e49eb1114 --- /dev/null +++ b/sql/updates/world/2016_03_12_2015_11_14_00_world.sql @@ -0,0 +1,3 @@ +DELETE FROM `trinity_string` WHERE `entry`=186; +INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES +(186, 'TransMapID: %u TransOffsetX: %f TransOffsetY: %f TransOffsetZ: %f TransOffsetO: %f (Transport ID: %u %s)'); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 8030ed1b060..f36b2dd140d 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -208,7 +208,9 @@ enum TrinityStrings LANG_INVALID_GAMEOBJECT_TYPE = 176, LANG_GAMEOBJECT_DAMAGED = 177, LANG_GRID_POSITION = 178, - // Room for more level 1 179-199 not used + // 179-185 used in 6.x branch + LANG_TRANSPORT_POSITION = 186, + // Room for more level 1 187-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 e3f8e12f219..15bb9d424cb 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -36,6 +36,7 @@ #include "MMapFactory.h" #include "DisableMgr.h" #include "SpellHistory.h" +#include "Transport.h" class misc_commandscript : public CommandScript { @@ -236,6 +237,10 @@ public: areaId, (areaEntry ? areaEntry->area_name : unknown), object->GetPhaseMask(), object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation()); + if (Transport* transport = object->GetTransport()) + handler->PSendSysMessage(LANG_TRANSPORT_POSITION, + transport->GetGOInfo()->moTransport.mapID, object->GetTransOffsetX(), object->GetTransOffsetY(), object->GetTransOffsetZ(), object->GetTransOffsetO(), + transport->GetEntry(), transport->GetName().c_str()); handler->PSendSysMessage(LANG_GRID_POSITION, cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), object->GetInstanceId(), zoneX, zoneY, groundZ, floorZ, haveMap, haveVMap, haveMMap);