diff options
| -rw-r--r-- | sql/mangos.sql | 4 | ||||
| -rw-r--r-- | sql/updates/7332_01_mangos_command.sql | 6 | ||||
| -rw-r--r-- | src/game/Level3.cpp | 32 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
4 files changed, 34 insertions, 10 deletions
diff --git a/sql/mangos.sql b/sql/mangos.sql index 7302faea9fc..0b46f3f9efd 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -22,7 +22,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, - `required_7331_01_mangos_command` bit(1) default NULL + `required_7332_01_mangos_command` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -275,7 +275,7 @@ INSERT INTO `command` VALUES ('demorph',2,'Syntax: .demorph\r\n\r\nDemorph the selected player.'), ('die',3,'Syntax: .die\r\n\r\nKill the selected player. If no player is selected, it will kill you.'), ('dismount',0,'Syntax: .dismount\r\n\r\nDismount you, if you are mounted.'), -('distance',3,'Syntax: .distance\r\n\r\nDisplay the distance from your character to the selected creature.'), +('distance',3,'Syntax: .distance [$name/$link]\r\n\r\nDisplay the distance from your character to the selected creature/player, or player with name $name, or player/creature/gameobject pointed to shift-link with guid.'), ('event',2,'Syntax: .event #event_id\r\nShow details about event with #event_id.'), ('event activelist',2,'Syntax: .event activelist\r\nShow list of currently active events.'), ('event start',2,'Syntax: .event start #event_id\r\nStart event #event_id. Set start time for event to current moment (change not saved in DB).'), diff --git a/sql/updates/7332_01_mangos_command.sql b/sql/updates/7332_01_mangos_command.sql new file mode 100644 index 00000000000..65248d19c61 --- /dev/null +++ b/sql/updates/7332_01_mangos_command.sql @@ -0,0 +1,6 @@ +ALTER TABLE db_version CHANGE COLUMN required_7331_01_mangos_command required_7332_01_mangos_command bit; + +DELETE FROM `command` WHERE `name` = 'distance'; + +INSERT INTO `command` VALUES +('distance',3,'Syntax: .distance [$name/$link]\r\n\r\nDisplay the distance from your character to the selected creature/player, or player with name $name, or player/creature/gameobject pointed to shift-link with guid.'); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 9eb19d90bc0..b00ef1764d2 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -3672,18 +3672,36 @@ bool ChatHandler::HandleGuildDeleteCommand(const char* args) return true; } -bool ChatHandler::HandleGetDistanceCommand(const char* /*args*/) +bool ChatHandler::HandleGetDistanceCommand(const char* args) { - Unit* pUnit = getSelectedUnit(); + WorldObject* obj; - if(!pUnit) + if (*args) { - SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); - SetSentErrorMessage(true); - return false; + uint64 guid = extractGuidFromLink((char*)args); + if(guid) + obj = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*m_session->GetPlayer(),guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); + + if(!obj) + { + SendSysMessage(LANG_PLAYER_NOT_FOUND); + SetSentErrorMessage(true); + return false; + } + } + else + { + obj = getSelectedUnit(); + + if(!obj) + { + SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE); + SetSentErrorMessage(true); + return false; + } } - PSendSysMessage(LANG_DISTANCE, m_session->GetPlayer()->GetDistance(pUnit),m_session->GetPlayer()->GetDistance2d(pUnit)); + PSendSysMessage(LANG_DISTANCE, m_session->GetPlayer()->GetDistance(obj),m_session->GetPlayer()->GetDistance2d(obj)); return true; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 019806b2369..78f402f3cca 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7331" + #define REVISION_NR "7332" #endif // __REVISION_NR_H__ |