Fixed up some of the postal system stuff for testing it.

6 files changed, 135 insertions, 1 deletions

diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 58b8905d..66f746f3 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -96,8 +96,21 @@ void CommandHandler::handleCommand(const std::string &command)
     else if (type == "post")
     {
         std::string::size_type pos = args.find(' ');
+        if (pos == std::string::npos)
+        {
+            chatWindow->chatLog("Please include the user and message");
+            return;
+        }
         std::string recipient(args, 0, pos);
+        if (recipient == "")
+        {
+            chatWindow->chatLog("Invalid user");
+        }
         std::string text(args, pos+1);
+        if (text == "")
+        {
+            chatWindow->chatLog("Invalid message");
+        }
         Net::GameServer::Player::sendLetter(recipient, text);
     }
     else if (type == "check")
diff --git a/src/game.cpp b/src/game.cpp
index fb434be2..fc16e1ea 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -82,6 +82,7 @@
 #include "net/network.h"
 #include "net/npchandler.h"
 #include "net/partyhandler.h"
+#include "net/posthandler.h"
 #include "net/playerhandler.h"
 #include "net/tradehandler.h"
 
@@ -272,6 +273,7 @@ Game::Game():
     mNpcHandler(new NPCHandler()),
     mPartyHandler(new PartyHandler()),
     mPlayerHandler(new PlayerHandler()),
+    mPostHandler(new PostHandler()),
     mTradeHandler(new TradeHandler()),
     mLogicCounterId(0), mSecondsCounterId(0)
 {
@@ -317,6 +319,7 @@ Game::Game():
     Net::registerHandler(mNpcHandler.get());
     Net::registerHandler(mPartyHandler.get());
     Net::registerHandler(mPlayerHandler.get());
+    Net::registerHandler(mPostHandler.get());
     Net::registerHandler(mTradeHandler.get());
 }
 
diff --git a/src/game.h b/src/game.h
index cdfe025b..78c5dc80 100644
--- a/src/game.h
+++ b/src/game.h
@@ -69,6 +69,7 @@ class Game : public ConfigListener
         MessageHandlerPtr mNpcHandler;
         MessageHandlerPtr mPartyHandler;
         MessageHandlerPtr mPlayerHandler;
+        MessageHandlerPtr mPostHandler;
         MessageHandlerPtr mTradeHandler;
 
         SDL_TimerID mLogicCounterId;
diff --git a/src/net/posthandler.cpp b/src/net/posthandler.cpp
new file mode 100644
index 00000000..673d8611
--- /dev/null
+++ b/src/net/posthandler.cpp
@@ -0,0 +1,80 @@
+/*
+ *  The Mana World
+ *  Copyright 2009 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "posthandler.h"
+
+#include <string>
+#include <sstream>
+
+#include "messagein.h"
+#include "protocol.h"
+
+#include "../gui/chat.h"
+
+PostHandler::PostHandler()
+{
+    static const Uint16 _messages[] = {
+        GPMSG_SEND_POST_RESPONSE,
+        GPMSG_GET_POST_RESPONSE,
+        0
+    };
+    handledMessages = _messages;
+}
+
+void PostHandler::handleMessage(MessageIn &msg)
+{
+    switch (msg.getId())
+    {
+        case GPMSG_SEND_POST_RESPONSE:
+        {
+            if (msg.readInt8() == ERRMSG_OK)
+            {
+                chatWindow->chatLog("Post sent successfully");
+            }
+            else
+            {
+                chatWindow->chatLog("Unable to send post");
+            }
+        } break;
+
+        case GPMSG_GET_POST_RESPONSE:
+        {
+            std::stringstream str;
+            // get the name of the sender
+            std::string sender = msg.readString();
+
+            if (sender == "")
+            {
+                chatWindow->chatLog("No post found");
+                break;
+            }
+
+            // get the message
+            std::string letter = msg.readString();
+
+            // put message together
+            str << "Message from " << sender << " says: " << letter;
+            chatWindow->chatLog(str.str());
+        } break;
+    }
+}
diff --git a/src/net/posthandler.h b/src/net/posthandler.h
new file mode 100644
index 00000000..d46b8bce
--- /dev/null
+++ b/src/net/posthandler.h
@@ -0,0 +1,37 @@
+/*
+ *  The Mana World
+ *  Copyright 2009 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_NET_POSTHANDLER_H
+#define _TMW_NET_POSTHANDLER_H
+
+#include "messagehandler.h"
+
+class PostHandler : public MessageHandler
+{
+public:
+    PostHandler();
+
+    void handleMessage(MessageIn &msg);
+};
+
+#endif
diff --git a/src/net/protocol.h b/src/net/protocol.h
index f766d2da..ad1eebdb 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -186,7 +186,7 @@ enum {
     PGMSG_SEND_POST                 = 0x04A0, // S player, S letter, { W attachment id }
     GPMSG_SEND_POST_RESPONSE        = 0x04A1, // B error
     PGMSG_GET_POST                  = 0x04A2, //
-    GPMSG_GET_POST_RESPONSE         = 0x04A3, // { L sender id, S letter, { W attachment id } }
+    GPMSG_GET_POST_RESPONSE         = 0x04A3, // { S sender name, S letter, { W attachment id } }
 
     XXMSG_INVALID = 0x7FFF
 };