4 files changed, 89 insertions, 15 deletions
diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp
index b8973c039..19b1e919d 100644
--- a/src/net/ea/itemhandler.cpp
+++ b/src/net/ea/itemhandler.cpp
@@ -26,6 +26,8 @@
 
 #include "net/messagein.h"
 
+#include "net/ea/itemrecv.h"
+
 #include "debug.h"
 
 namespace Ea
@@ -39,16 +41,4 @@ ItemHandler::~ItemHandler()
 {
 }
 
-void ItemHandler::processItemRemove(Net::MessageIn &msg)
-{
-    if (actorManager)
-    {
-        if (FloorItem *const item = actorManager
-            ->findItem(msg.readBeingId("floor item id")))
-        {
-            actorManager->destroy(item);
-        }
-    }
-}
-
 }  // namespace Ea
diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h
index 67fe288b9..f8365990b 100644
--- a/src/net/ea/itemhandler.h
+++ b/src/net/ea/itemhandler.h
@@ -41,9 +41,6 @@ class ItemHandler notfinal
         A_DELETE_COPY(ItemHandler)
 
         virtual ~ItemHandler();
-
-    protected:
-        static void processItemRemove(Net::MessageIn &msg);
 };
 
 }  // namespace Ea
diff --git a/src/net/ea/itemrecv.cpp b/src/net/ea/itemrecv.cpp
new file mode 100644
index 000000000..c2702bdc7
--- /dev/null
+++ b/src/net/ea/itemrecv.cpp
@@ -0,0 +1,46 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  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/ea/itemrecv.h"
+
+#include "actormanager.h"
+
+#include "net/messagein.h"
+
+#include "debug.h"
+
+namespace Ea
+{
+
+void ItemRecv::processItemRemove(Net::MessageIn &msg)
+{
+    if (actorManager)
+    {
+        if (FloorItem *const item = actorManager
+            ->findItem(msg.readBeingId("floor item id")))
+        {
+            actorManager->destroy(item);
+        }
+    }
+}
+
+}  // namespace Ea
diff --git a/src/net/ea/itemrecv.h b/src/net/ea/itemrecv.h
new file mode 100644
index 000000000..a97a9b385
--- /dev/null
+++ b/src/net/ea/itemrecv.h
@@ -0,0 +1,41 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  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_EA_ITEMRECV_H
+#define NET_EA_ITEMRECV_H
+
+#include "localconsts.h"
+
+namespace Net
+{
+    class MessageIn;
+}
+
+namespace Ea
+{
+    namespace ItemRecv
+    {
+        void processItemRemove(Net::MessageIn &msg);
+    }  // namespace ItemRecv
+}  // namespace Ea
+
+#endif  // NET_EA_ITEMRECV_H