summaryrefslogtreecommitdiff
path: root/src/net/eathena/inventoryhandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-11 00:20:57 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-11 00:20:57 +0300
commit067410031057ffc9bdb36b976bc2a658b23acb1b (patch)
treeca60538b0a1aef7aabcd2d89250efe98961e85cb /src/net/eathena/inventoryhandler.cpp
parent7d9f6bd3984c423b89a9f564342cde74f378f8c9 (diff)
downloadmv-067410031057ffc9bdb36b976bc2a658b23acb1b.tar.gz
mv-067410031057ffc9bdb36b976bc2a658b23acb1b.tar.bz2
mv-067410031057ffc9bdb36b976bc2a658b23acb1b.tar.xz
mv-067410031057ffc9bdb36b976bc2a658b23acb1b.zip
Add typed bool type Favorite.
Diffstat (limited to 'src/net/eathena/inventoryhandler.cpp')
-rw-r--r--src/net/eathena/inventoryhandler.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index f2d22ef14..162b69f2b 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -385,7 +385,7 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
1,
fromBool(flags.bits.isIdentified, Identified),
fromBool(flags.bits.isDamaged, Damaged),
- flags.bits.isFavorite,
+ fromBool(flags.bits.isFavorite, Favorite),
true, false);
inventory->setCards(index, cards, 4);
}
@@ -485,7 +485,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
1,
fromBool(identified, Identified),
fromBool(damaged, Damaged),
- false,
+ Favorite_false,
equipType != 0, false);
inventory->setCards(index, cards, 4);
}
@@ -533,7 +533,7 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
0, 1,
fromBool(flags.bits.isIdentified, Identified),
fromBool(flags.bits.isDamaged, Damaged),
- flags.bits.isFavorite,
+ fromBool(flags.bits.isFavorite, Favorite),
false, false);
inventory->setCards(index, cards, 4);
}
@@ -569,7 +569,8 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg)
cards, amount, 0, 1,
fromBool(flags.bits.isIdentified, Identified),
fromBool(flags.bits.isDamaged, Damaged),
- flags.bits.isFavorite, false));
+ fromBool(flags.bits.isFavorite, Favorite),
+ false));
}
BLOCK_END("InventoryHandler::processPlayerInventory")
}
@@ -669,7 +670,7 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
cards, amount, refine, 1,
fromBool(flags.bits.isIdentified, Identified),
fromBool(flags.bits.isDamaged, Damaged),
- flags.bits.isFavorite,
+ fromBool(flags.bits.isFavorite, Favorite),
false));
}
BLOCK_END("InventoryHandler::processPlayerStorageEquip")
@@ -703,7 +704,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);
}
}
@@ -845,7 +847,8 @@ void InventoryHandler::processPlayerCartAdd(Net::MessageIn &msg)
1,
fromBool(identified, Identified),
Damaged_false,
- false, false, false);
+ Favorite_false,
+ false, false);
inventory->setCards(index, cards, 4);
}
BLOCK_END("InventoryHandler::processPlayerCartAdd")
@@ -878,7 +881,7 @@ void InventoryHandler::processPlayerCartEquip(Net::MessageIn &msg)
cards, amount, refine, 1,
fromBool(flags.bits.isIdentified, Identified),
fromBool(flags.bits.isDamaged, Damaged),
- flags.bits.isFavorite,
+ fromBool(flags.bits.isFavorite, Favorite),
false));
}
BLOCK_END("InventoryHandler::processPlayerCartEquip")
@@ -910,7 +913,7 @@ void InventoryHandler::processPlayerCartItems(Net::MessageIn &msg)
cards, amount, 0, 1,
fromBool(flags.bits.isIdentified, Identified),
fromBool(flags.bits.isDamaged, Damaged),
- flags.bits.isFavorite,
+ fromBool(flags.bits.isFavorite, Favorite),
false));
}
BLOCK_END("InventoryHandler::processPlayerCartItems")