diff options
author | Nay <dnpd.dd@gmail.com> | 2013-03-15 23:39:51 +0000 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2013-03-15 23:39:51 +0000 |
commit | efdbc68caea5dbe5f9dcdc8f3531ae3a7b2c4e76 (patch) | |
tree | 12885d8124cbc267f638e7bb7a5dfd400a33c9ce | |
parent | 3b9ab08029a224fe0f1548eb8187c4186f4ea29b (diff) |
Scripts/Commands: Fix "cannot pass objects of non-trivially-copyable type ‘std::string’ through ‘...’"
-rw-r--r-- | sql/updates/world/2013_03_15_02_world_trinity_strings.sql (renamed from sql/updates/world/2013_03_15_01_world_trinity_strings.sql) | 2 | ||||
-rw-r--r-- | src/server/scripts/Commands/cs_message.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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 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; } |