From 4a337b7a42d0c92bc2ed26b7e206188dc04c569d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 11 Feb 2015 12:16:03 +0300
Subject: Add typed bool type Equipm.

---
 src/net/tmwa/inventoryhandler.cpp | 32 ++++++++++++++++++++------------
 src/net/tmwa/tradehandler.cpp     |  4 ++--
 2 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'src/net/tmwa')

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);
         }
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 5411a59f5..2ec2c90d7 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -199,7 +199,7 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
                     Identified_true,
                     Damaged_false,
                     Favorite_false,
-                    false);
+                    Equipm_false);
             }
             else
             {
@@ -210,7 +210,7 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
                     fromBool(identify, Identified),
                     Damaged_false,
                     Favorite_false,
-                    false);
+                    Equipm_false);
             }
         }
     }
-- 
cgit v1.2.3-70-g09d2