From efdbc68caea5dbe5f9dcdc8f3531ae3a7b2c4e76 Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 15 Mar 2013 23:39:51 +0000 Subject: [PATCH] =?UTF-8?q?Scripts/Commands:=20Fix=20"cannot=20pass=20obje?= =?UTF-8?q?cts=20of=20non-trivially-copyable=20type=20=E2=80=98std::string?= =?UTF-8?q?=E2=80=99=20through=20=E2=80=98...=E2=80=99"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ty_strings.sql => 2013_03_15_02_world_trinity_strings.sql} | 2 +- src/server/scripts/Commands/cs_message.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename sql/updates/world/{2013_03_15_01_world_trinity_strings.sql => 2013_03_15_02_world_trinity_strings.sql} (70%) diff --git a/sql/updates/world/2013_03_15_01_world_trinity_strings.sql b/sql/updates/world/2013_03_15_02_world_trinity_strings.sql similarity index 70% rename from sql/updates/world/2013_03_15_01_world_trinity_strings.sql rename to sql/updates/world/2013_03_15_02_world_trinity_strings.sql index 0ae44b1ae53..b81c22711c4 100644 --- a/sql/updates/world/2013_03_15_01_world_trinity_strings.sql +++ b/sql/updates/world/2013_03_15_02_world_trinity_strings.sql @@ -1,3 +1,3 @@ -DELETE FROM `trinity_string` where `entry`=363; +DELETE FROM `trinity_string` WHERE `entry`=363; INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES (363, 'Player %s cannot whisper you any longer.'); diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp index 66f55b85c1c..218d16d8b68 100644 --- a/src/server/scripts/Commands/cs_message.cpp +++ b/src/server/scripts/Commands/cs_message.cpp @@ -213,12 +213,12 @@ public: if (Player* player = sObjectAccessor->FindPlayerByName(name)) { handler->GetSession()->GetPlayer()->RemoveFromWhisperWhiteList(player->GetGUID()); - handler->PSendSysMessage(LANG_COMMAND_WHISPEROFFPLAYER, name); + handler->PSendSysMessage(LANG_COMMAND_WHISPEROFFPLAYER, name.c_str()); return true; } else { - handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND, name); + handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND, name.c_str()); handler->SetSentErrorMessage(true); return false; }