summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-03 23:21:54 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:56 +0300
commit7890bb3f423dbdb815d97f066594ae8917c5cee7 (patch)
tree69b484e4e0f28384590a650b79a1ae77bb5f0a23
parenta37b34f16d81c0b60376c63a11974c401faa2f91 (diff)
downloadplus-7890bb3f423dbdb815d97f066594ae8917c5cee7.tar.gz
plus-7890bb3f423dbdb815d97f066594ae8917c5cee7.tar.bz2
plus-7890bb3f423dbdb815d97f066594ae8917c5cee7.tar.xz
plus-7890bb3f423dbdb815d97f066594ae8917c5cee7.zip
eathena: move processPlayerUnEquip from ea namespace into eathena and tmwa.
-rw-r--r--src/net/ea/inventoryhandler.cpp14
-rw-r--r--src/net/ea/inventoryhandler.h2
-rw-r--r--src/net/eathena/inventoryhandler.cpp14
-rw-r--r--src/net/eathena/inventoryhandler.h2
-rw-r--r--src/net/tmwa/inventoryhandler.cpp14
-rw-r--r--src/net/tmwa/inventoryhandler.h2
6 files changed, 32 insertions, 16 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 3477d0498..a1b7dbd8e 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -386,20 +386,6 @@ void InventoryHandler::processPlayerStorageClose(Net::MessageIn &msg A_UNUSED)
BLOCK_END("InventoryHandler::processPlayerStorageClose")
}
-void InventoryHandler::processPlayerUnEquip(Net::MessageIn &msg)
-{
- BLOCK_START("InventoryHandler::processPlayerUnEquip")
- msg.readInt16(); // inder val - INVENTORY_OFFSET;
- const int equipType = msg.readInt16();
- const uint8_t flag = msg.readUInt8();
-
- if (flag)
- mEquips.setEquipment(getSlot(equipType), -1);
- if (equipType & 0x8000)
- ArrowsListener::distributeEvent();
- BLOCK_END("InventoryHandler::processPlayerUnEquip")
-}
-
void InventoryHandler::processPlayerAttackRange(Net::MessageIn &msg)
{
BLOCK_START("InventoryHandler::processPlayerAttackRange")
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index bbb90a3a8..0ba52e564 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -96,8 +96,6 @@ class InventoryHandler notfinal : public Net::InventoryHandler
void processPlayerStorageClose(Net::MessageIn &msg);
- void processPlayerUnEquip(Net::MessageIn &msg);
-
static void processPlayerAttackRange(Net::MessageIn &msg);
void processPlayerArrowEquip(Net::MessageIn &msg);
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index d0458a61b..da404fe05 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -411,4 +411,18 @@ void InventoryHandler::processPlayerEquip(Net::MessageIn &msg)
BLOCK_END("InventoryHandler::processPlayerEquip")
}
+void InventoryHandler::processPlayerUnEquip(Net::MessageIn &msg)
+{
+ BLOCK_START("InventoryHandler::processPlayerUnEquip")
+ msg.readInt16(); // inder val - INVENTORY_OFFSET;
+ const int equipType = msg.readInt16();
+ const uint8_t flag = msg.readUInt8();
+
+ if (flag)
+ mEquips.setEquipment(getSlot(equipType), -1);
+ if (equipType & 0x8000)
+ ArrowsListener::distributeEvent();
+ BLOCK_END("InventoryHandler::processPlayerUnEquip")
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h
index 7d1b9ddfc..78f35acbb 100644
--- a/src/net/eathena/inventoryhandler.h
+++ b/src/net/eathena/inventoryhandler.h
@@ -66,6 +66,8 @@ class InventoryHandler final : public MessageHandler,
void processPlayerInventory(Net::MessageIn &msg);
void processPlayerEquip(Net::MessageIn &msg);
+
+ void processPlayerUnEquip(Net::MessageIn &msg);
};
} // namespace EAthena
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 0ff31370d..3feccd1fa 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -414,4 +414,18 @@ void InventoryHandler::processPlayerEquip(Net::MessageIn &msg)
BLOCK_END("InventoryHandler::processPlayerEquip")
}
+void InventoryHandler::processPlayerUnEquip(Net::MessageIn &msg)
+{
+ BLOCK_START("InventoryHandler::processPlayerUnEquip")
+ msg.readInt16(); // inder val - INVENTORY_OFFSET;
+ const int equipType = msg.readInt16();
+ const uint8_t flag = msg.readUInt8();
+
+ if (flag)
+ mEquips.setEquipment(getSlot(equipType), -1);
+ if (equipType & 0x8000)
+ ArrowsListener::distributeEvent();
+ BLOCK_END("InventoryHandler::processPlayerUnEquip")
+}
+
} // namespace TmwAthena
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index a41e47ebf..b1172ef81 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -66,6 +66,8 @@ class InventoryHandler final : public MessageHandler,
void processPlayerInventory(Net::MessageIn &msg);
void processPlayerEquip(Net::MessageIn &msg);
+
+ void processPlayerUnEquip(Net::MessageIn &msg);
};
} // namespace TmwAthena