diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-02-11 00:20:57 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-02-11 00:20:57 +0300 |
commit | 067410031057ffc9bdb36b976bc2a658b23acb1b (patch) | |
tree | ca60538b0a1aef7aabcd2d89250efe98961e85cb /src/net/tmwa | |
parent | 7d9f6bd3984c423b89a9f564342cde74f378f8c9 (diff) | |
download | mv-067410031057ffc9bdb36b976bc2a658b23acb1b.tar.gz mv-067410031057ffc9bdb36b976bc2a658b23acb1b.tar.bz2 mv-067410031057ffc9bdb36b976bc2a658b23acb1b.tar.xz mv-067410031057ffc9bdb36b976bc2a658b23acb1b.zip |
Add typed bool type Favorite.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 36 | ||||
-rw-r--r-- | src/net/tmwa/tradehandler.cpp | 6 |
2 files changed, 28 insertions, 14 deletions
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 7c53612eb..45b9d47eb 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -300,7 +300,8 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg) identified, Identified_true, Damaged_false, - false, true, false); + Favorite_false, + true, false); } else { @@ -308,7 +309,8 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg) 1, fromBool(identified, Identified), Damaged_false, - false, true, false); + Favorite_false, + true, false); } inventory->setCards(index, cards, 4); } @@ -408,7 +410,8 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) identified, Identified_true, Damaged_false, - false, equipType != 0, false); + Favorite_false, + equipType != 0, false); } else { @@ -416,7 +419,8 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) 1, fromBool(identified, Identified), Damaged_false, - false, equipType != 0, false); + Favorite_false, + equipType != 0, false); } inventory->setCards(index, cards, 4); } @@ -475,7 +479,8 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg) 0, identified, Identified_true, Damaged_false, - false, isEquipment, false); + Favorite_false, + isEquipment, false); } else { @@ -483,7 +488,8 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg) 0, 1, fromBool(identified, Identified), Damaged_false, - false, isEquipment, false); + Favorite_false, + isEquipment, false); } inventory->setCards(index, cards, 4); } @@ -525,7 +531,8 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg) itemType, cards, amount, 0, identified, Identified_true, Damaged_false, - false, false)); + Favorite_false, + false)); } else { @@ -533,7 +540,8 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg) itemType, cards, amount, 0, 1, fromBool(identified, Identified), Damaged_false, - false, false)); + Favorite_false, + false)); } } BLOCK_END("InventoryHandler::processPlayerInventory") @@ -604,7 +612,8 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg) itemType, cards, amount, refine, identified, Identified_true, Damaged_false, - false, false)); + Favorite_false, + false)); } else { @@ -612,7 +621,8 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg) itemType, cards, amount, refine, 1, fromBool(identified, Identified), Damaged_false, - false, false)); + Favorite_false, + false)); } } BLOCK_END("InventoryHandler::processPlayerStorageEquip") @@ -647,7 +657,8 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg) refine, identified, Identified_true, Damaged_false, - false, false, false); + Favorite_false, + false, false); } else { @@ -655,7 +666,8 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg) refine, 1, fromBool(identified, Identified), Damaged_false, - false, false, false); + Favorite_false, + false, false); } mStorage->setCards(index, cards, 4); } diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 29575adbc..5411a59f5 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -198,7 +198,8 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg) identify, Identified_true, Damaged_false, - false, false); + Favorite_false, + false); } else { @@ -208,7 +209,8 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg) refine, 1, fromBool(identify, Identified), Damaged_false, - false, false); + Favorite_false, + false); } } } |