From 067410031057ffc9bdb36b976bc2a658b23acb1b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 11 Feb 2015 00:20:57 +0300
Subject: Add typed bool type Favorite.

---
 src/net/eathena/inventoryhandler.cpp | 21 ++++++++++++---------
 src/net/eathena/tradehandler.cpp     |  3 ++-
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/net/eathena')

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")
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index 16819b802..d6240c580 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -209,7 +209,8 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
                 refine, 1,
                 fromBool(identify, Identified),
                 Damaged_false,
-                false, false);
+                Favorite_false,
+                false);
         }
     }
 }
-- 
cgit v1.2.3-60-g2f50