summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-10 23:26:53 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-10 23:26:53 +0300
commitb81f22b9ca68675d16fa2263b89d7dd0d179ef45 (patch)
tree7a4554927636a77d5233ceffc1814eee1fdd3578 /src/net/tmwa
parentf3f7879c48fe8e202c3519cd465225645949167e (diff)
downloadmanaverse-b81f22b9ca68675d16fa2263b89d7dd0d179ef45.tar.gz
manaverse-b81f22b9ca68675d16fa2263b89d7dd0d179ef45.tar.bz2
manaverse-b81f22b9ca68675d16fa2263b89d7dd0d179ef45.tar.xz
manaverse-b81f22b9ca68675d16fa2263b89d7dd0d179ef45.zip
Add typed bool type Damaged.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/inventoryhandler.cpp36
-rw-r--r--src/net/tmwa/tradehandler.cpp7
2 files changed, 29 insertions, 14 deletions
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index efaff9567..4319b84f2 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -299,14 +299,16 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
inventory->setItem(index, itemId, itemType, 1, refine,
identified,
Identified_True,
- false, false, true, false);
+ Damaged_False,
+ false, true, false);
}
else
{
inventory->setItem(index, itemId, itemType, 1, refine,
1,
fromBool(identified, Identified),
- false, false, true, false);
+ Damaged_False,
+ false, true, false);
}
inventory->setCards(index, cards, 4);
}
@@ -405,14 +407,16 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
inventory->setItem(index, itemId, type, amount, refine,
identified,
Identified_True,
- false, false, equipType != 0, false);
+ Damaged_False,
+ false, equipType != 0, false);
}
else
{
inventory->setItem(index, itemId, type, amount, refine,
1,
fromBool(identified, Identified),
- false, false, equipType != 0, false);
+ Damaged_False,
+ false, equipType != 0, false);
}
inventory->setCards(index, cards, 4);
}
@@ -470,14 +474,16 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
inventory->setItem(index, itemId, itemType, amount,
0, identified,
Identified_True,
- false, false, isEquipment, false);
+ Damaged_False,
+ false, isEquipment, false);
}
else
{
inventory->setItem(index, itemId, itemType, amount,
0, 1,
fromBool(identified, Identified),
- false, false, isEquipment, false);
+ Damaged_False,
+ false, isEquipment, false);
}
inventory->setCards(index, cards, 4);
}
@@ -518,14 +524,16 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg)
mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
itemType, cards, amount, 0, identified,
Identified_True,
- false, false, false));
+ Damaged_False,
+ false, false));
}
else
{
mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
itemType, cards, amount, 0, 1,
fromBool(identified, Identified),
- false, false, false));
+ Damaged_False,
+ false, false));
}
}
BLOCK_END("InventoryHandler::processPlayerInventory")
@@ -595,14 +603,16 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
itemType, cards, amount, refine, identified,
Identified_True,
- false, false, false));
+ Damaged_False,
+ false, false));
}
else
{
mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
itemType, cards, amount, refine, 1,
fromBool(identified, Identified),
- false, false, false));
+ Damaged_False,
+ false, false));
}
}
BLOCK_END("InventoryHandler::processPlayerStorageEquip")
@@ -636,14 +646,16 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
mStorage->setItem(index, itemId, 0, amount,
refine, identified,
Identified_True,
- false, false, false, false);
+ Damaged_False,
+ false, false, false);
}
else
{
mStorage->setItem(index, itemId, 0, amount,
refine, 1,
fromBool(identified, Identified),
- false, false, false, false);
+ Damaged_False,
+ false, false, false);
}
mStorage->setCards(index, cards, 4);
}
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 53336bb24..a00bd4952 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -196,7 +196,9 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
false, amount,
refine,
identify,
- Identified_True, false, false, false);
+ Identified_True,
+ Damaged_False,
+ false, false);
}
else
{
@@ -205,7 +207,8 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
false, amount,
refine, 1,
fromBool(identify, Identified),
- false, false, false);
+ Damaged_False,
+ false, false);
}
}
}