summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/itemhandler.cpp64
-rw-r--r--src/net/tmwa/itemhandler.h5
-rw-r--r--src/net/tmwa/itemrecv.cpp89
-rw-r--r--src/net/tmwa/itemrecv.h39
4 files changed, 134 insertions, 63 deletions
diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp
index 60daadb75..990b91366 100644
--- a/src/net/tmwa/itemhandler.cpp
+++ b/src/net/tmwa/itemhandler.cpp
@@ -24,6 +24,9 @@
#include "actormanager.h"
+#include "net/ea/itemrecv.h"
+
+#include "net/tmwa/itemrecv.h"
#include "net/tmwa/protocol.h"
#include "debug.h"
@@ -51,15 +54,15 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_ITEM_VISIBLE:
- processItemVisible(msg);
+ ItemRecv::processItemVisible(msg);
break;
case SMSG_ITEM_DROPPED:
- processItemDropped(msg);
+ ItemRecv::processItemDropped(msg);
break;
case SMSG_ITEM_REMOVE:
- processItemRemove(msg);
+ Ea::ItemRecv::processItemRemove(msg);
break;
default:
@@ -68,59 +71,4 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
BLOCK_END("ItemHandler::handleMessage")
}
-void ItemHandler::processItemDropped(Net::MessageIn &msg)
-{
- const BeingId id = msg.readBeingId("item object id");
- const int itemId = msg.readInt16("item id");
- const Identified identify = fromInt(msg.readUInt8("identify"), Identified);
- const int x = msg.readInt16("x");
- const int y = msg.readInt16("y");
- const int subX = static_cast<int>(msg.readInt8("sub x"));
- const int subY = static_cast<int>(msg.readInt8("sub y"));
- const int amount = msg.readInt16("amount");
-
- if (actorManager)
- {
- actorManager->createItem(id,
- itemId,
- x, y,
- 0,
- amount,
- 0,
- ItemColor_one,
- identify,
- Damaged_false,
- subX, subY,
- nullptr);
- }
-}
-
-void ItemHandler::processItemVisible(Net::MessageIn &msg)
-{
- const BeingId id = msg.readBeingId("item object id");
- const int itemId = msg.readInt16("item id");
- const Identified identified = fromInt(
- msg.readUInt8("identify"), Identified);
- const int x = msg.readInt16("x");
- const int y = msg.readInt16("y");
- const int amount = msg.readInt16("amount");
- const int subX = static_cast<int>(msg.readInt8("sub x"));
- const int subY = static_cast<int>(msg.readInt8("sub y"));
-
- if (actorManager)
- {
- actorManager->createItem(id,
- itemId,
- x, y,
- 0,
- amount,
- 0,
- ItemColor_one,
- identified,
- Damaged_false,
- subX, subY,
- nullptr);
- }
-}
-
} // namespace TmwAthena
diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h
index d8debe7e4..c81eba3c3 100644
--- a/src/net/tmwa/itemhandler.h
+++ b/src/net/tmwa/itemhandler.h
@@ -38,11 +38,6 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler
A_DELETE_COPY(ItemHandler)
void handleMessage(Net::MessageIn &msg) override final;
-
- protected:
- static void processItemDropped(Net::MessageIn &msg);
-
- static void processItemVisible(Net::MessageIn &msg);
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/itemrecv.cpp b/src/net/tmwa/itemrecv.cpp
new file mode 100644
index 000000000..eca928f1b
--- /dev/null
+++ b/src/net/tmwa/itemrecv.cpp
@@ -0,0 +1,89 @@
+/*
+ * 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/tmwa/itemrecv.h"
+
+#include "actormanager.h"
+
+#include "net/tmwa/protocol.h"
+
+#include "debug.h"
+
+namespace TmwAthena
+{
+
+void ItemRecv::processItemDropped(Net::MessageIn &msg)
+{
+ const BeingId id = msg.readBeingId("item object id");
+ const int itemId = msg.readInt16("item id");
+ const Identified identify = fromInt(msg.readUInt8("identify"), Identified);
+ const int x = msg.readInt16("x");
+ const int y = msg.readInt16("y");
+ const int subX = static_cast<int>(msg.readInt8("sub x"));
+ const int subY = static_cast<int>(msg.readInt8("sub y"));
+ const int amount = msg.readInt16("amount");
+
+ if (actorManager)
+ {
+ actorManager->createItem(id,
+ itemId,
+ x, y,
+ 0,
+ amount,
+ 0,
+ ItemColor_one,
+ identify,
+ Damaged_false,
+ subX, subY,
+ nullptr);
+ }
+}
+
+void ItemRecv::processItemVisible(Net::MessageIn &msg)
+{
+ const BeingId id = msg.readBeingId("item object id");
+ const int itemId = msg.readInt16("item id");
+ const Identified identified = fromInt(
+ msg.readUInt8("identify"), Identified);
+ const int x = msg.readInt16("x");
+ const int y = msg.readInt16("y");
+ const int amount = msg.readInt16("amount");
+ const int subX = static_cast<int>(msg.readInt8("sub x"));
+ const int subY = static_cast<int>(msg.readInt8("sub y"));
+
+ if (actorManager)
+ {
+ actorManager->createItem(id,
+ itemId,
+ x, y,
+ 0,
+ amount,
+ 0,
+ ItemColor_one,
+ identified,
+ Damaged_false,
+ subX, subY,
+ nullptr);
+ }
+}
+
+} // namespace TmwAthena
diff --git a/src/net/tmwa/itemrecv.h b/src/net/tmwa/itemrecv.h
new file mode 100644
index 000000000..86e8a1a5a
--- /dev/null
+++ b/src/net/tmwa/itemrecv.h
@@ -0,0 +1,39 @@
+/*
+ * 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_TMWA_ITEMRECV_H
+#define NET_TMWA_ITEMRECV_H
+
+#include "net/tmwa/messagehandler.h"
+
+#include "net/ea/itemhandler.h"
+
+namespace TmwAthena
+{
+ namespace ItemRecv
+ {
+ void processItemDropped(Net::MessageIn &msg);
+ void processItemVisible(Net::MessageIn &msg);
+ } // namespace ItemRecv
+} // namespace TmwAthena
+
+#endif // NET_TMWA_ITEMRECV_H
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-03 09:38:39 +0000