Merge branch 'master' into online-player-listonline-player-list

Conflicts:
	src/net/tmwa/chathandler.cpp

1 files changed, 14 insertions, 0 deletions

diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 0b111104..a282a943 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -52,6 +52,7 @@ ChatHandler::ChatHandler()
         SMSG_WHISPER,
         SMSG_WHISPER_RESPONSE,
         SMSG_GM_CHAT,
+        SMSG_SCRIPT_MESSAGE,
         SMSG_ONLINE_LIST,
         0
     };
@@ -243,6 +244,19 @@ void ChatHandler::handleMessage(MessageIn &msg)
             }
             break;
         }
+
+        case SMSG_SCRIPT_MESSAGE:
+        {
+            chatMsgLength = msg.readInt16() - 5;
+            if (chatMsgLength <= 0)
+                break;
+
+            msg.readInt8();     // message type
+
+            SERVER_NOTICE(msg.readString(chatMsgLength))
+            break;
+        }
+
         case SMSG_ONLINE_LIST:
         {
             int length = msg.readInt16();