diff options
| author | Vincent-Michael <vincent_michael@gmx.de> | 2015-10-18 03:55:14 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-03-12 21:37:40 +0100 |
| commit | 782bc7cfaa086d4ba2b01cbeb0b8963dd27d75f1 (patch) | |
| tree | df172352f0cd6a5d9ae45cf5b759ec75f80d618b | |
| parent | 2a37266269d317a7856ce2126c812f56cbd00691 (diff) | |
Core/Commands: Added transport position for command .gps
(cherry picked from commit 9c99a1d0c7d802fdaf8f944f73aa7eb2a6560950)
| -rw-r--r-- | sql/updates/world/2016_03_12_2015_11_14_00_world.sql | 3 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 4 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_misc.cpp | 5 |
3 files changed, 11 insertions, 1 deletions
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 62c2a3a1981..dcee5ff7071 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 7f493f833e6..3e35a721162 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 { @@ -237,6 +238,10 @@ public: areaId, (areaEntry ? areaEntry->area_name[handler->GetSessionDbcLocale()] : 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); |