diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-02-11 12:16:03 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-02-11 12:16:03 +0300 |
commit | 4a337b7a42d0c92bc2ed26b7e206188dc04c569d (patch) | |
tree | 97c59c86246afce0710795c6ba545d40004c6810 /src/net/eathena | |
parent | 067410031057ffc9bdb36b976bc2a658b23acb1b (diff) | |
download | ManaVerse-4a337b7a42d0c92bc2ed26b7e206188dc04c569d.tar.gz ManaVerse-4a337b7a42d0c92bc2ed26b7e206188dc04c569d.tar.bz2 ManaVerse-4a337b7a42d0c92bc2ed26b7e206188dc04c569d.tar.xz ManaVerse-4a337b7a42d0c92bc2ed26b7e206188dc04c569d.zip |
Add typed bool type Equipm.
Diffstat (limited to 'src/net/eathena')
-rw-r--r-- | src/net/eathena/inventoryhandler.cpp | 23 | ||||
-rw-r--r-- | src/net/eathena/tradehandler.cpp | 19 |
2 files changed, 27 insertions, 15 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 162b69f2b..835b341a8 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -386,7 +386,8 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg) fromBool(flags.bits.isIdentified, Identified), fromBool(flags.bits.isDamaged, Damaged), fromBool(flags.bits.isFavorite, Favorite), - true, false); + Equipm_true, + false); inventory->setCards(index, cards, 4); } @@ -486,7 +487,8 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) fromBool(identified, Identified), fromBool(damaged, Damaged), Favorite_false, - equipType != 0, false); + fromBool(equipType, Equipm), + false); inventory->setCards(index, cards, 4); } ArrowsListener::distributeEvent(); @@ -534,7 +536,8 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg) fromBool(flags.bits.isIdentified, Identified), fromBool(flags.bits.isDamaged, Damaged), fromBool(flags.bits.isFavorite, Favorite), - false, false); + Equipm_false, + false); inventory->setCards(index, cards, 4); } } @@ -570,7 +573,7 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg) fromBool(flags.bits.isIdentified, Identified), fromBool(flags.bits.isDamaged, Damaged), fromBool(flags.bits.isFavorite, Favorite), - false)); + Equipm_false)); } BLOCK_END("InventoryHandler::processPlayerInventory") } @@ -671,7 +674,7 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg) fromBool(flags.bits.isIdentified, Identified), fromBool(flags.bits.isDamaged, Damaged), fromBool(flags.bits.isFavorite, Favorite), - false)); + Equipm_false)); } BLOCK_END("InventoryHandler::processPlayerStorageEquip") } @@ -705,7 +708,8 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg) fromBool(identified, Identified), Damaged_false, Favorite_false, - false, false); + Equipm_false, + false); mStorage->setCards(index, cards, 4); } } @@ -848,7 +852,8 @@ void InventoryHandler::processPlayerCartAdd(Net::MessageIn &msg) fromBool(identified, Identified), Damaged_false, Favorite_false, - false, false); + Equipm_false, + false); inventory->setCards(index, cards, 4); } BLOCK_END("InventoryHandler::processPlayerCartAdd") @@ -882,7 +887,7 @@ void InventoryHandler::processPlayerCartEquip(Net::MessageIn &msg) fromBool(flags.bits.isIdentified, Identified), fromBool(flags.bits.isDamaged, Damaged), fromBool(flags.bits.isFavorite, Favorite), - false)); + Equipm_false)); } BLOCK_END("InventoryHandler::processPlayerCartEquip") } @@ -914,7 +919,7 @@ void InventoryHandler::processPlayerCartItems(Net::MessageIn &msg) fromBool(flags.bits.isIdentified, Identified), fromBool(flags.bits.isDamaged, Damaged), fromBool(flags.bits.isFavorite, Favorite), - false)); + Equipm_false)); } BLOCK_END("InventoryHandler::processPlayerCartItems") } diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index d6240c580..c2ff5553c 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -210,7 +210,7 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg) fromBool(identify, Identified), Damaged_false, Favorite_false, - false); + Equipm_false); } } } @@ -230,11 +230,18 @@ void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg) return; if (tradeWindow) { - tradeWindow->addItem2(item->getId(), item->getType(), - item->getCards(), 4, - true, mQuantity, item->getRefine(), item->getColor(), - item->getIdentified(), item->getDamaged(), - item->getFavorite(), item->isEquipment()); + tradeWindow->addItem2(item->getId(), + item->getType(), + item->getCards(), + 4, + true, + mQuantity, + item->getRefine(), + item->getColor(), + item->getIdentified(), + item->getDamaged(), + item->getFavorite(), + item->isEquipment()); } item->increaseQuantity(-mQuantity); mItemIndex = -1; |