summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-10 23:26:53 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-10 23:26:53 +0300
commitb81f22b9ca68675d16fa2263b89d7dd0d179ef45 (patch)
tree7a4554927636a77d5233ceffc1814eee1fdd3578 /src/net/eathena
parentf3f7879c48fe8e202c3519cd465225645949167e (diff)
downloadplus-b81f22b9ca68675d16fa2263b89d7dd0d179ef45.tar.gz
plus-b81f22b9ca68675d16fa2263b89d7dd0d179ef45.tar.bz2
plus-b81f22b9ca68675d16fa2263b89d7dd0d179ef45.tar.xz
plus-b81f22b9ca68675d16fa2263b89d7dd0d179ef45.zip
Add typed bool type Damaged.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/inventoryhandler.cpp28
-rw-r--r--src/net/eathena/tradehandler.cpp3
2 files changed, 21 insertions, 10 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 0c6ef7141..2be927bc9 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -384,7 +384,7 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
inventory->setItem(index, itemId, itemType, 1, refine,
1,
fromBool(flags.bits.isIdentified, Identified),
- flags.bits.isDamaged,
+ fromBool(flags.bits.isDamaged, Damaged),
flags.bits.isFavorite,
true, false);
inventory->setCards(index, cards, 4);
@@ -484,7 +484,8 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
inventory->setItem(index, itemId, itemType, amount, refine,
1,
fromBool(identified, Identified),
- damaged != 0, false,
+ fromBool(damaged, Damaged),
+ false,
equipType != 0, false);
inventory->setCards(index, cards, 4);
}
@@ -531,7 +532,7 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
inventory->setItem(index, itemId, itemType, amount,
0, 1,
fromBool(flags.bits.isIdentified, Identified),
- flags.bits.isDamaged,
+ fromBool(flags.bits.isDamaged, Damaged),
flags.bits.isFavorite,
false, false);
inventory->setCards(index, cards, 4);
@@ -567,7 +568,8 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg)
mInventoryItems.push_back(Ea::InventoryItem(index, itemId, itemType,
cards, amount, 0, 1,
fromBool(flags.bits.isIdentified, Identified),
- flags.bits.isDamaged, flags.bits.isFavorite, false));
+ fromBool(flags.bits.isDamaged, Damaged),
+ flags.bits.isFavorite, false));
}
BLOCK_END("InventoryHandler::processPlayerInventory")
}
@@ -666,7 +668,9 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
mInventoryItems.push_back(Ea::InventoryItem(index, itemId, itemType,
cards, amount, refine, 1,
fromBool(flags.bits.isIdentified, Identified),
- flags.bits.isDamaged, flags.bits.isFavorite, false));
+ fromBool(flags.bits.isDamaged, Damaged),
+ flags.bits.isFavorite,
+ false));
}
BLOCK_END("InventoryHandler::processPlayerStorageEquip")
}
@@ -698,7 +702,8 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
mStorage->setItem(index, itemId, itemType, amount,
refine, 1,
fromBool(identified, Identified),
- false, false, false, false);
+ Damaged_False,
+ false, false, false);
mStorage->setCards(index, cards, 4);
}
}
@@ -839,7 +844,8 @@ void InventoryHandler::processPlayerCartAdd(Net::MessageIn &msg)
inventory->setItem(index, itemId, itemType, amount, refine,
1,
fromBool(identified, Identified),
- false, false, false, false);
+ Damaged_False,
+ false, false, false);
inventory->setCards(index, cards, 4);
}
BLOCK_END("InventoryHandler::processPlayerCartAdd")
@@ -871,7 +877,9 @@ void InventoryHandler::processPlayerCartEquip(Net::MessageIn &msg)
mCartItems.push_back(Ea::InventoryItem(index, itemId, itemType,
cards, amount, refine, 1,
fromBool(flags.bits.isIdentified, Identified),
- flags.bits.isDamaged, flags.bits.isFavorite, false));
+ fromBool(flags.bits.isDamaged, Damaged),
+ flags.bits.isFavorite,
+ false));
}
BLOCK_END("InventoryHandler::processPlayerCartEquip")
}
@@ -901,7 +909,9 @@ void InventoryHandler::processPlayerCartItems(Net::MessageIn &msg)
mCartItems.push_back(Ea::InventoryItem(index, itemId, itemType,
cards, amount, 0, 1,
fromBool(flags.bits.isIdentified, Identified),
- flags.bits.isDamaged, flags.bits.isFavorite, false));
+ fromBool(flags.bits.isDamaged, Damaged),
+ flags.bits.isFavorite,
+ false));
}
BLOCK_END("InventoryHandler::processPlayerCartItems")
}
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index 303ebd7c9..a1a5f261b 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -208,7 +208,8 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
false, amount,
refine, 1,
fromBool(identify, Identified),
- false, false, false);
+ Damaged_False,
+ false, false);
}
}
}