From 7ab514532164cfac50abc4f45cbefc6a39b21b6a Mon Sep 17 00:00:00 2001 From: DDuarte Date: Tue, 5 Jul 2016 11:21:50 +0100 Subject: [PATCH] Scripts/Commands: Remove unused argument of .cometome command (cherry picked from commit 1100fe60572b186eee98b6b7cbdccf5a2d67b7e1) # Conflicts: # sql/updates/world/3.3.5/2016_07_05_01_world.sql --- sql/updates/world/3.3.5/2016_07_05_02_world.sql | 1 + src/server/scripts/Commands/cs_misc.cpp | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) create mode 100644 sql/updates/world/3.3.5/2016_07_05_02_world.sql diff --git a/sql/updates/world/3.3.5/2016_07_05_02_world.sql b/sql/updates/world/3.3.5/2016_07_05_02_world.sql new file mode 100644 index 0000000000..2921c19b0c --- /dev/null +++ b/sql/updates/world/3.3.5/2016_07_05_02_world.sql @@ -0,0 +1 @@ +UPDATE `command` SET `help` = 'Syntax: .cometome\nMake selected creature come to your current location (new position not saved to DB).' WHERE `command`.`name` = 'cometome'; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 7ad8035299..31af42d001 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -2183,17 +2183,9 @@ public: } return true; } - /* - ComeToMe command REQUIRED for 3rd party scripting library to have access to PointMovementGenerator - Without this function 3rd party scripting library will get linking errors (unresolved external) - when attempting to use the PointMovementGenerator - */ + static bool HandleComeToMeCommand(ChatHandler* handler, char const* args) { - char const* newFlagStr = strtok((char*)args, " "); - if (!newFlagStr) - return false; - Creature* caster = handler->getSelectedCreature(); if (!caster) {