Move receive code from auctionhandler into separate file.

6 files changed, 136 insertions, 67 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6427077e0..02acfca5e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1518,6 +1518,8 @@ SET(SRCS_EATHENA
     net/eathena/admin.h
     net/eathena/adminhandler.cpp
     net/eathena/adminhandler.h
+    net/eathena/auction.cpp
+    net/eathena/auction.h
     net/eathena/auctionhandler.cpp
     net/eathena/auctionhandler.h
     net/eathena/bankhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 4467997b9..aaaf43fa5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1364,6 +1364,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
 	      net/eathena/admin.h \
 	      net/eathena/adminhandler.cpp \
 	      net/eathena/adminhandler.h \
+	      net/eathena/auction.cpp \
+	      net/eathena/auction.h \
 	      net/eathena/auctionhandler.cpp \
 	      net/eathena/auctionhandler.h \
 	      net/eathena/bankhandler.cpp \
diff --git a/src/net/eathena/auction.cpp b/src/net/eathena/auction.cpp
new file mode 100644
index 000000000..558e822e0
--- /dev/null
+++ b/src/net/eathena/auction.cpp
@@ -0,0 +1,83 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/eathena/auction.h"
+
+#include "logger.h"
+
+#include "net/eathena/messagein.h"
+
+#include "debug.h"
+
+namespace EAthena
+{
+
+void Auction::processOpenWindow(Net::MessageIn &msg)
+{
+    UNIMPLIMENTEDPACKET;
+    msg.readInt32("flag");  // 0 - open, 1 - close
+}
+
+void Auction::processAuctionResults(Net::MessageIn &msg)
+{
+    UNIMPLIMENTEDPACKET;
+    msg.readInt16("len");
+    msg.readInt32("pages");
+    const int itemCount = msg.readInt32("items count");
+    for (int f = 0; f < itemCount; f ++)
+    {
+        msg.readInt32("auction id");
+        msg.readString(24, "seller name");
+        msg.readInt32("item id");
+        msg.readInt32("auction type");
+        msg.readInt16("item amount");  // always 1
+        msg.readUInt8("identify");
+        msg.readUInt8("attribute");
+        msg.readUInt8("refine");
+        for (int d = 0; d < 4; d ++)
+            msg.readInt16("card");
+        msg.readInt32("price");
+        msg.readInt32("buy now");
+        msg.readString(24, "buyer name");
+        msg.readInt32("timestamp");
+        // +++ need use ItemColorManager for color
+    }
+}
+
+void Auction::processAuctionSetItem(Net::MessageIn &msg)
+{
+    UNIMPLIMENTEDPACKET;
+    msg.readInt16("index");
+    msg.readUInt8("flag");
+}
+
+void Auction::processAuctionMessage(Net::MessageIn &msg)
+{
+    UNIMPLIMENTEDPACKET;
+    msg.readUInt8("message");
+}
+
+void Auction::processAuctionClose(Net::MessageIn &msg)
+{
+    UNIMPLIMENTEDPACKET;
+    msg.readInt16("flag");
+}
+
+}  // namespace EAthena
diff --git a/src/net/eathena/auction.h b/src/net/eathena/auction.h
new file mode 100644
index 000000000..675f7423d
--- /dev/null
+++ b/src/net/eathena/auction.h
@@ -0,0 +1,43 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EATHENA_AUCTION_H
+#define NET_EATHENA_AUCTION_H
+
+#ifdef EATHENA_SUPPORT
+
+#include "net/auctionhandler.h"
+
+#include "net/eathena/messagehandler.h"
+
+namespace EAthena
+{
+    namespace Auction
+    {
+        void processOpenWindow(Net::MessageIn &msg);
+        void processAuctionResults(Net::MessageIn &msg);
+        void processAuctionSetItem(Net::MessageIn &msg);
+        void processAuctionMessage(Net::MessageIn &msg);
+        void processAuctionClose(Net::MessageIn &msg);
+    }  // namespace Admin
+}  // namespace EAthena
+
+#endif  // EATHENA_SUPPORT
+#endif  // NET_EATHENA_AUCTION_H
diff --git a/src/net/eathena/auctionhandler.cpp b/src/net/eathena/auctionhandler.cpp
index f75efd2ea..4ee007953 100644
--- a/src/net/eathena/auctionhandler.cpp
+++ b/src/net/eathena/auctionhandler.cpp
@@ -25,6 +25,7 @@
 
 #include "net/ea/eaprotocol.h"
 
+#include "net/eathena/auction.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
@@ -56,23 +57,23 @@ void AuctionHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case SMSG_AUCTION_OPEN_WINDOW:
-            processOpenWindow(msg);
+            Auction::processOpenWindow(msg);
             break;
 
         case SMSG_AUCTION_RESULTS:
-            processAuctionResults(msg);
+            Auction::processAuctionResults(msg);
             break;
 
         case SMSG_AUCTION_SET_ITEM:
-            processAuctionSetItem(msg);
+            Auction::processAuctionSetItem(msg);
             break;
 
         case SMSG_AUCTION_MESSAGE:
-            processAuctionMessage(msg);
+            Auction::processAuctionMessage(msg);
             break;
 
         case SMSG_AUCTION_CLOSE:
-            processAuctionClose(msg);
+            Auction::processAuctionClose(msg);
             break;
 
         default:
@@ -80,57 +81,6 @@ void AuctionHandler::handleMessage(Net::MessageIn &msg)
     }
 }
 
-void AuctionHandler::processOpenWindow(Net::MessageIn &msg)
-{
-    UNIMPLIMENTEDPACKET;
-    msg.readInt32("flag");  // 0 - open, 1 - close
-}
-
-void AuctionHandler::processAuctionResults(Net::MessageIn &msg)
-{
-    UNIMPLIMENTEDPACKET;
-    msg.readInt16("len");
-    msg.readInt32("pages");
-    const int itemCount = msg.readInt32("items count");
-    for (int f = 0; f < itemCount; f ++)
-    {
-        msg.readInt32("auction id");
-        msg.readString(24, "seller name");
-        msg.readInt32("item id");
-        msg.readInt32("auction type");
-        msg.readInt16("item amount");  // always 1
-        msg.readUInt8("identify");
-        msg.readUInt8("attribute");
-        msg.readUInt8("refine");
-        for (int d = 0; d < 4; d ++)
-            msg.readInt16("card");
-        msg.readInt32("price");
-        msg.readInt32("buy now");
-        msg.readString(24, "buyer name");
-        msg.readInt32("timestamp");
-        // +++ need use ItemColorManager for color
-    }
-}
-
-void AuctionHandler::processAuctionSetItem(Net::MessageIn &msg)
-{
-    UNIMPLIMENTEDPACKET;
-    msg.readInt16("index");
-    msg.readUInt8("flag");
-}
-
-void AuctionHandler::processAuctionMessage(Net::MessageIn &msg)
-{
-    UNIMPLIMENTEDPACKET;
-    msg.readUInt8("message");
-}
-
-void AuctionHandler::processAuctionClose(Net::MessageIn &msg)
-{
-    UNIMPLIMENTEDPACKET;
-    msg.readInt16("flag");
-}
-
 void AuctionHandler::cancelReg() const
 {
     createOutPacket(CMSG_AUCTION_CANCEL_REG);
diff --git a/src/net/eathena/auctionhandler.h b/src/net/eathena/auctionhandler.h
index db20ee341..df0f57e61 100644
--- a/src/net/eathena/auctionhandler.h
+++ b/src/net/eathena/auctionhandler.h
@@ -62,17 +62,6 @@ class AuctionHandler final : public MessageHandler, public Net::AuctionHandler
         void buy() const override final;
 
         void sell() const override final;
-
-    protected:
-        static void processOpenWindow(Net::MessageIn &msg);
-
-        static void processAuctionResults(Net::MessageIn &msg);
-
-        static void processAuctionSetItem(Net::MessageIn &msg);
-
-        static void processAuctionMessage(Net::MessageIn &msg);
-
-        static void processAuctionClose(Net::MessageIn &msg);
 };
 
 }  // namespace EAthena