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/tmwa/inventoryhandler.cpp | |
| parent | 067410031057ffc9bdb36b976bc2a658b23acb1b (diff) | |
| download | manaplus-4a337b7a42d0c92bc2ed26b7e206188dc04c569d.tar.gz manaplus-4a337b7a42d0c92bc2ed26b7e206188dc04c569d.tar.bz2 manaplus-4a337b7a42d0c92bc2ed26b7e206188dc04c569d.tar.xz manaplus-4a337b7a42d0c92bc2ed26b7e206188dc04c569d.zip | |
Add typed bool type Equipm.
Diffstat (limited to 'src/net/tmwa/inventoryhandler.cpp')
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 45b9d47eb..0d0611122 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -301,7 +301,8 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg) Identified_true, Damaged_false, Favorite_false, - true, false); + Equipm_true, + false); } else { @@ -310,7 +311,8 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg) fromBool(identified, Identified), Damaged_false, Favorite_false, - true, false); + Equipm_true, + false); } inventory->setCards(index, cards, 4); } @@ -411,7 +413,8 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) Identified_true, Damaged_false, Favorite_false, - equipType != 0, false); + fromBool(equipType, Equipm), + false); } else { @@ -420,7 +423,8 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) fromBool(identified, Identified), Damaged_false, Favorite_false, - equipType != 0, false); + fromBool(equipType, Equipm), + false); } inventory->setCards(index, cards, 4); } @@ -480,7 +484,8 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg) Identified_true, Damaged_false, Favorite_false, - isEquipment, false); + fromBool(isEquipment, Equipm), + false); } else { @@ -489,7 +494,8 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg) fromBool(identified, Identified), Damaged_false, Favorite_false, - isEquipment, false); + fromBool(isEquipment, Equipm), + false); } inventory->setCards(index, cards, 4); } @@ -532,7 +538,7 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg) Identified_true, Damaged_false, Favorite_false, - false)); + Equipm_false)); } else { @@ -541,7 +547,7 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg) fromBool(identified, Identified), Damaged_false, Favorite_false, - false)); + Equipm_false)); } } BLOCK_END("InventoryHandler::processPlayerInventory") @@ -613,7 +619,7 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg) Identified_true, Damaged_false, Favorite_false, - false)); + Equipm_false)); } else { @@ -622,7 +628,7 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg) fromBool(identified, Identified), Damaged_false, Favorite_false, - false)); + Equipm_false)); } } BLOCK_END("InventoryHandler::processPlayerStorageEquip") @@ -658,7 +664,8 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg) Identified_true, Damaged_false, Favorite_false, - false, false); + Equipm_false, + false); } else { @@ -667,7 +674,8 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg) fromBool(identified, Identified), Damaged_false, Favorite_false, - false, false); + Equipm_false, + false); } mStorage->setCards(index, cards, 4); } |