Add to item field favorite.

6 files changed, 32 insertions, 22 deletions

diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index e43e0de9c..8bf795deb 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -285,6 +285,7 @@ void InventoryHandler::processPlayerStorageStatus(Net::MessageIn &msg)
             (*it).color,
             (*it).identified,
             (*it).damaged,
+            (*it).favorite,
             (*it).equip,
             false);
     }
diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h
index 19d9135f9..c0f5e15a1 100644
--- a/src/net/ea/inventoryitem.h
+++ b/src/net/ea/inventoryitem.h
@@ -47,6 +47,7 @@ class InventoryItem final
         unsigned char color;
         bool identified;
         bool damaged;
+        bool favorite;
         bool equip;
 
         InventoryItem(const int slot0,
@@ -56,6 +57,7 @@ class InventoryItem final
                       const unsigned char color0,
                       const bool identified0,
                       const bool damaged0,
+                      const bool favorite0,
                       const bool equip0) :
             slot(slot0),
             id(id0),
@@ -64,6 +66,7 @@ class InventoryItem final
             color(color0),
             identified(identified0),
             damaged(damaged0),
+            favorite(favorite0),
             equip(equip0)
         {
         }
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 4189dde81..fcdeb68c3 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -326,7 +326,9 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
         if (inventory)
         {
             inventory->setItem(index, itemId, 1, refine,
-                1, flags.bits.isIdentified, flags.bits.isDamaged, true, false);
+                1, flags.bits.isIdentified, flags.bits.isDamaged,
+                flags.bits.isFavorite,
+                true, false);
         }
 
         if (equipType)
@@ -422,7 +424,8 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
                 amount += item->getQuantity();
 
             inventory->setItem(index, itemId, amount, refine,
-                1, identified != 0, damaged != 0, equipType != 0, false);
+                1, identified != 0, damaged != 0, false,
+                equipType != 0, false);
         }
         ArrowsListener::distributeEvent();
     }
@@ -467,7 +470,8 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
         {
             inventory->setItem(index, itemId, amount,
                 0, 1, flags.bits.isIdentified,
-                flags.bits.isDamaged, false, false);
+                flags.bits.isDamaged, flags.bits.isFavorite,
+                false, false);
         }
     }
     BLOCK_END("InventoryHandler::processPlayerInventory")
@@ -500,7 +504,7 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg)
 
         mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
             amount, 0, 1, flags.bits.isIdentified,
-            flags.bits.isDamaged, false));
+            flags.bits.isDamaged, flags.bits.isFavorite, false));
     }
     BLOCK_END("InventoryHandler::processPlayerInventory")
 }
@@ -599,7 +603,7 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
 
         mInventoryItems.push_back(Ea::InventoryItem(index,
             itemId, amount, refine, 1, flags.bits.isIdentified,
-            flags.bits.isDamaged, false));
+            flags.bits.isDamaged, flags.bits.isFavorite, false));
     }
     BLOCK_END("InventoryHandler::processPlayerStorageEquip")
 }
@@ -630,7 +634,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
         if (mStorage)
         {
             mStorage->setItem(index, itemId, amount,
-                refine, 1, identified != 0, false, false, false);
+                refine, 1, identified != 0, false, false, false, false);
         }
     }
     BLOCK_END("InventoryHandler::processPlayerStorageAdd")
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index e992ee497..45310761f 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -201,7 +201,7 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
         else
         {
             tradeWindow->addItem2(type, false, amount,
-                refine, 1, identify != 0, false, false);
+                refine, 1, identify != 0, false, false, false);
         }
     }
 }
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 6685efd7c..645da2da7 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -271,12 +271,12 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
             if (serverFeatures->haveItemColors())
             {
                 inventory->setItem(index, itemId, 1, refine,
-                    identified, true, false, true, false);
+                    identified, true, false, false, true, false);
             }
             else
             {
                 inventory->setItem(index, itemId, 1, refine,
-                    1, identified != 0, false, true, false);
+                    1, identified != 0, false, false, true, false);
             }
         }
 
@@ -371,12 +371,12 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
             if (serverFeatures->haveItemColors())
             {
                 inventory->setItem(index, itemId, amount, refine,
-                    identified, true, false, equipType != 0, false);
+                    identified, true, false, false, equipType != 0, false);
             }
             else
             {
                 inventory->setItem(index, itemId, amount, refine,
-                    1, identified != 0, false, equipType != 0, false);
+                    1, identified != 0, false, false, equipType != 0, false);
             }
         }
         ArrowsListener::distributeEvent();
@@ -431,12 +431,12 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
             if (serverFeatures->haveItemColors())
             {
                 inventory->setItem(index, itemId, amount,
-                    0, identified, true, false, isEquipment, false);
+                    0, identified, true, false, false, isEquipment, false);
             }
             else
             {
                 inventory->setItem(index, itemId, amount,
-                    0, 1, identified != 0, false, isEquipment, false);
+                    0, 1, identified != 0, false, false, isEquipment, false);
             }
         }
     }
@@ -474,12 +474,12 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg)
         if (serverFeatures->haveItemColors())
         {
             mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
-                amount, 0, identified, true, false, false));
+                amount, 0, identified, true, false, false, false));
         }
         else
         {
             mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
-                amount, 0, 1, identified != 0, false, false));
+                amount, 0, 1, identified != 0, false, false, false));
         }
     }
     BLOCK_END("InventoryHandler::processPlayerInventory")
@@ -547,12 +547,14 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
         if (serverFeatures->haveItemColors())
         {
             mInventoryItems.push_back(Ea::InventoryItem(index,
-                itemId, amount, refine, identified, true, false, false));
+                itemId, amount, refine, identified, true,
+                false, false, false));
         }
         else
         {
             mInventoryItems.push_back(Ea::InventoryItem(index,
-                itemId, amount, refine, 1, identified != 0, false, false));
+                itemId, amount, refine, 1, identified != 0,
+                false, false, false));
         }
     }
     BLOCK_END("InventoryHandler::processPlayerStorageEquip")
@@ -583,12 +585,12 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
             if (serverFeatures->haveItemColors())
             {
                 mStorage->setItem(index, itemId, amount,
-                    refine, identified, true, false, false, false);
+                    refine, identified, true, false, false, false, false);
             }
             else
             {
                 mStorage->setItem(index, itemId, amount,
-                    refine, 1, identified != 0, false, false, false);
+                    refine, 1, identified != 0, false, false, false, false);
             }
         }
     }
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index c0ced4c42..30b432d2f 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -183,12 +183,12 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
             if (serverFeatures->haveItemColors())
             {
                 tradeWindow->addItem2(type, false, amount,
-                    refine, identify, true, false, false);
+                    refine, identify, true, false, false, false);
             }
             else
             {
                 tradeWindow->addItem2(type, false, amount,
-                    refine, 1, identify != 0, false, false);
+                    refine, 1, identify != 0, false, false, false);
             }
         }
     }
@@ -220,7 +220,7 @@ void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg)
                 tradeWindow->addItem2(item->getId(), true,
                     quantity, item->getRefine(), item->getColor(),
                     item->getIdentified(), item->getDamaged(),
-                    item->isEquipment());
+                    item->getFavorite(), item->isEquipment());
             }
             item->increaseQuantity(-quantity);
             break;