aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Chat
diff options
context:
space:
mode:
authorclick <none@none>2010-07-23 09:26:23 +0200
committerclick <none@none>2010-07-23 09:26:23 +0200
commit3f9ea75bfa990b2079c581052073fcf4962dd594 (patch)
tree919ffc43bd81fd5b0949c9edac5a8c29b7918b3e /src/server/game/Chat
parent912a099d491a58e068994c63a1055ab17af37634 (diff)
Add SOAP-implementation (based on Benjys patch and adapted for latest core by xk1)
--HG-- branch : trunk
Diffstat (limited to 'src/server/game/Chat')
-rw-r--r--src/server/game/Chat/Chat.cpp4
-rw-r--r--src/server/game/Chat/Chat.h6
2 files changed, 6 insertions, 4 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 5efd4b4ef6a..d2f23434f2b 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -2402,8 +2402,8 @@ bool CliHandler::isAvailable(ChatCommand const& cmd) const
void CliHandler::SendSysMessage(const char *str)
{
- m_print(str);
- m_print("\r\n");
+ m_print(m_callbackArg, str);
+ m_print(m_callbackArg, "\r\n");
}
std::string CliHandler::GetNameLink() const
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 1a649c687d1..71bd82d29b0 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -76,6 +76,7 @@ class ChatHandler
static ChatCommand* getCommandTable();
bool isValidChatMessage(const char* msg);
+ bool HasSentErrorMessage() { return sentErrorMessage;}
void SendGlobalSysMessage(const char *str);
protected:
explicit ChatHandler() : m_session(NULL) {} // for CLI subclass
@@ -652,8 +653,8 @@ class ChatHandler
class CliHandler : public ChatHandler
{
public:
- typedef void Print(char const*);
- explicit CliHandler(Print* zprint) : m_print(zprint) {}
+ typedef void Print(void*, char const*);
+ explicit CliHandler(void* callbackArg, Print* zprint) : m_callbackArg(callbackArg), m_print(zprint) {}
// overwrite functions
const char *GetTrinityString(int32 entry) const;
@@ -665,6 +666,7 @@ class CliHandler : public ChatHandler
int GetSessionDbLocaleIndex() const;
private:
+ void* m_callbackArg;
Print* m_print;
};