diff options
Diffstat (limited to 'src/game/Chat.cpp')
| -rw-r--r-- | src/game/Chat.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 4d68048b8b8..3c595d49124 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -35,7 +35,6 @@ #include "Player.h" #include "UpdateMask.h" #include "SpellMgr.h" -#include "ScriptCalls.h" // Supported shift-links (client generated and server side) // |color|Hachievement:achievement_id:player_guid:0:0:0:0:0:0:0:0|h[name]|h|r @@ -1185,7 +1184,7 @@ valid examples: } else if (reader.get() != '|') { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage sequence aborted unexpectedly"); #endif return false; @@ -1194,7 +1193,7 @@ valid examples: // pipe has always to be followed by at least one char if (reader.peek() == '\0') { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage pipe followed by \\0"); #endif return false; @@ -1219,7 +1218,7 @@ valid examples: } else { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage invalid sequence, expected %c but got %c", *validSequenceIterator, commandChar); #endif return false; @@ -1228,7 +1227,7 @@ valid examples: else if (validSequence != validSequenceIterator) { // no escaped pipes in sequences -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage got escaped pipe in sequence"); #endif return false; @@ -1245,7 +1244,7 @@ valid examples: reader >> c; if (!c) { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage got \\0 while reading color in |c command"); #endif return false; @@ -1263,7 +1262,7 @@ valid examples: color |= 10+c-'a'; continue; } -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage got non hex char '%c' while reading color", c); #endif return false; @@ -1281,7 +1280,7 @@ valid examples: linkedItem= objmgr.GetItemPrototype(atoi(buffer)); if (!linkedItem) { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage got invalid itemID %u in |item command", atoi(buffer)); #endif return false; @@ -1289,7 +1288,7 @@ valid examples: if (color != ItemQualityColors[linkedItem->Quality]) { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage linked item has color %u, but user claims %u", ItemQualityColors[linkedItem->Quality], color); #endif @@ -1501,7 +1500,7 @@ valid examples: } else { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage user sent unsupported link type '%s'", buffer); #endif return false; @@ -1514,7 +1513,7 @@ valid examples: // links start with '[' if (reader.get() != '[') { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage link caption doesn't start with '['"); #endif return false; @@ -1640,7 +1639,7 @@ valid examples: } if (!foundName) { -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage linked item name wasn't found in any localization"); #endif return false; @@ -1672,7 +1671,7 @@ valid examples: // no further payload break; default: -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG sLog.outBasic("ChatHandler::isValidChatMessage got invalid command |%c", commandChar); #endif return false; @@ -1680,7 +1679,7 @@ valid examples: } // check if every opened sequence was also closed properly -#ifdef MANGOS_DEBUG +#ifdef TRINITY_DEBUG if (validSequence != validSequenceIterator) sLog.outBasic("ChatHandler::isValidChatMessage EOF in active sequence"); #endif |