summaryrefslogtreecommitdiff
path: root/src/net/eathena/itemrecv.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-24 23:29:04 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-24 23:29:04 +0300
commit4e97da8e138b21a5f5bea75e6a8d3211e4f28594 (patch)
treec10d3cad963066a908ebd42041723e110a0c9bf0 /src/net/eathena/itemrecv.cpp
parentca0ca278d0c4aed9a6d50bb9a8982f5261151ab8 (diff)
downloadmanaplus-4e97da8e138b21a5f5bea75e6a8d3211e4f28594.tar.gz
manaplus-4e97da8e138b21a5f5bea75e6a8d3211e4f28594.tar.bz2
manaplus-4e97da8e138b21a5f5bea75e6a8d3211e4f28594.tar.xz
manaplus-4e97da8e138b21a5f5bea75e6a8d3211e4f28594.zip
Add enum for item types.
Diffstat (limited to 'src/net/eathena/itemrecv.cpp')
-rw-r--r--src/net/eathena/itemrecv.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/net/eathena/itemrecv.cpp b/src/net/eathena/itemrecv.cpp
index 822b4684d..80b0bd7a2 100644
--- a/src/net/eathena/itemrecv.cpp
+++ b/src/net/eathena/itemrecv.cpp
@@ -28,6 +28,8 @@
#include "const/resources/item/cards.h"
+#include "enums/resources/itemtype.h"
+
#include "net/messagein.h"
#include "debug.h"
@@ -39,7 +41,7 @@ void ItemRecv::processItemDropped(Net::MessageIn &msg)
{
const BeingId id = msg.readBeingId("id");
const int itemId = msg.readInt16("item id");
- const int itemType = msg.readInt16("type");
+ const ItemTypeT itemType = fromInt(msg.readInt16("type"), ItemTypeT);
const Identified identified = fromInt(
msg.readUInt8("identify"), Identified);
const int x = msg.readInt16("x");
@@ -68,7 +70,7 @@ void ItemRecv::processItemDropped2(Net::MessageIn &msg)
{
const BeingId id = msg.readBeingId("id");
const int itemId = msg.readInt16("item id");
- const int itemType = msg.readUInt8("type");
+ const ItemTypeT itemType = fromInt(msg.readUInt8("type"), ItemTypeT);
const Identified identified = fromInt(
msg.readUInt8("identify"), Identified);
const Damaged damaged = fromBool(msg.readUInt8("attribute"), Damaged);
@@ -127,7 +129,7 @@ void ItemRecv::processItemVisible(Net::MessageIn &msg)
actorManager->createItem(id,
itemId,
x, y,
- 0,
+ ItemType::Unknown,
amount,
0,
ItemColor_one,
@@ -142,7 +144,7 @@ void ItemRecv::processItemVisible2(Net::MessageIn &msg)
{
const BeingId id = msg.readBeingId("item object id");
const int itemId = msg.readInt16("item id");
- const int itemType = msg.readUInt8("type");
+ const ItemTypeT itemType = fromInt(msg.readUInt8("type"), ItemTypeT);
const Identified identified = fromInt(
msg.readUInt8("identify"), Identified);
const Damaged damaged = fromBool(msg.readUInt8("attribute"), Damaged);