summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/beingequipbackend.cpp4
-rw-r--r--src/enums/simpletypes.h8
-rw-r--r--src/gui/windows/itemamountwindow.cpp4
-rw-r--r--src/net/eathena/inventoryhandler.cpp4
-rw-r--r--src/net/eathena/tradehandler.cpp2
-rw-r--r--src/net/tmwa/inventoryhandler.cpp36
-rw-r--r--src/net/tmwa/tradehandler.cpp6
-rw-r--r--src/shopitem.cpp8
8 files changed, 36 insertions, 36 deletions
diff --git a/src/beingequipbackend.cpp b/src/beingequipbackend.cpp
index c751dddc0..ecd779cc4 100644
--- a/src/beingequipbackend.cpp
+++ b/src/beingequipbackend.cpp
@@ -44,8 +44,8 @@ BeingEquipBackend::BeingEquipBackend(Being *const being)
{
mEquipment[idx] = new Item(id, 0, 1, 0,
being->mSpriteColorsIds[f],
- Identified_True,
- Damaged_False,
+ Identified_true,
+ Damaged_false,
false, true, true);
}
}
diff --git a/src/enums/simpletypes.h b/src/enums/simpletypes.h
index 11b5b9a42..26851ff0d 100644
--- a/src/enums/simpletypes.h
+++ b/src/enums/simpletypes.h
@@ -31,16 +31,16 @@
False = false, \
True = true \
}; \
- const name name##_True = name::True; \
- const name name##_False = name::False
+ const name name##_true = name::True; \
+ const name name##_false = name::False
#define fromBool(val, name) \
(val) ? name::True : name::False
#else // ADVGCC
#define defBoolEnum(name) \
- const bool name##_True = true; \
- const bool name##_False = false; \
+ const bool name##_true = true; \
+ const bool name##_false = false; \
typedef bool name
#define fromBool(val, name) \
(val) ? true : false
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index b144140d2..b2f08db98 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -335,8 +335,8 @@ void ItemAmountWindow::action(const ActionEvent &event)
mItemDropDown->getSelected())).getId();
mItem = new Item(id, 0, 10000, 0, 1,
- Identified_True,
- Damaged_True,
+ Identified_true,
+ Damaged_true,
false, false, false);
if (mUsage == ShopBuyAdd)
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 2be927bc9..f2d22ef14 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -702,7 +702,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
mStorage->setItem(index, itemId, itemType, amount,
refine, 1,
fromBool(identified, Identified),
- Damaged_False,
+ Damaged_false,
false, false, false);
mStorage->setCards(index, cards, 4);
}
@@ -844,7 +844,7 @@ void InventoryHandler::processPlayerCartAdd(Net::MessageIn &msg)
inventory->setItem(index, itemId, itemType, amount, refine,
1,
fromBool(identified, Identified),
- Damaged_False,
+ Damaged_false,
false, false, false);
inventory->setCards(index, cards, 4);
}
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index a1a5f261b..16819b802 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -208,7 +208,7 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
false, amount,
refine, 1,
fromBool(identify, Identified),
- Damaged_False,
+ Damaged_false,
false, false);
}
}
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 4319b84f2..7c53612eb 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -298,8 +298,8 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
{
inventory->setItem(index, itemId, itemType, 1, refine,
identified,
- Identified_True,
- Damaged_False,
+ Identified_true,
+ Damaged_false,
false, true, false);
}
else
@@ -307,7 +307,7 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
inventory->setItem(index, itemId, itemType, 1, refine,
1,
fromBool(identified, Identified),
- Damaged_False,
+ Damaged_false,
false, true, false);
}
inventory->setCards(index, cards, 4);
@@ -406,8 +406,8 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
{
inventory->setItem(index, itemId, type, amount, refine,
identified,
- Identified_True,
- Damaged_False,
+ Identified_true,
+ Damaged_false,
false, equipType != 0, false);
}
else
@@ -415,7 +415,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
inventory->setItem(index, itemId, type, amount, refine,
1,
fromBool(identified, Identified),
- Damaged_False,
+ Damaged_false,
false, equipType != 0, false);
}
inventory->setCards(index, cards, 4);
@@ -473,8 +473,8 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
{
inventory->setItem(index, itemId, itemType, amount,
0, identified,
- Identified_True,
- Damaged_False,
+ Identified_true,
+ Damaged_false,
false, isEquipment, false);
}
else
@@ -482,7 +482,7 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
inventory->setItem(index, itemId, itemType, amount,
0, 1,
fromBool(identified, Identified),
- Damaged_False,
+ Damaged_false,
false, isEquipment, false);
}
inventory->setCards(index, cards, 4);
@@ -523,8 +523,8 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg)
{
mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
itemType, cards, amount, 0, identified,
- Identified_True,
- Damaged_False,
+ Identified_true,
+ Damaged_false,
false, false));
}
else
@@ -532,7 +532,7 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg)
mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
itemType, cards, amount, 0, 1,
fromBool(identified, Identified),
- Damaged_False,
+ Damaged_false,
false, false));
}
}
@@ -602,8 +602,8 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
{
mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
itemType, cards, amount, refine, identified,
- Identified_True,
- Damaged_False,
+ Identified_true,
+ Damaged_false,
false, false));
}
else
@@ -611,7 +611,7 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
mInventoryItems.push_back(Ea::InventoryItem(index, itemId,
itemType, cards, amount, refine, 1,
fromBool(identified, Identified),
- Damaged_False,
+ Damaged_false,
false, false));
}
}
@@ -645,8 +645,8 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
{
mStorage->setItem(index, itemId, 0, amount,
refine, identified,
- Identified_True,
- Damaged_False,
+ Identified_true,
+ Damaged_false,
false, false, false);
}
else
@@ -654,7 +654,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
mStorage->setItem(index, itemId, 0, amount,
refine, 1,
fromBool(identified, Identified),
- Damaged_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 a00bd4952..29575adbc 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -196,8 +196,8 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
false, amount,
refine,
identify,
- Identified_True,
- Damaged_False,
+ Identified_true,
+ Damaged_false,
false, false);
}
else
@@ -207,7 +207,7 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
false, amount,
refine, 1,
fromBool(identify, Identified),
- Damaged_False,
+ Damaged_false,
false, false);
}
}
diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index 2871e1853..16df6026a 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.cpp
@@ -39,8 +39,8 @@ ShopItem::ShopItem(const int inventoryIndex,
const int quantity,
const int price) :
Item(id, type, 0, 0, color,
- Identified_True,
- Damaged_False,
+ Identified_true,
+ Damaged_false,
false, false, false),
mDisplayName(),
mDuplicates(),
@@ -57,8 +57,8 @@ ShopItem::ShopItem(const int id,
const unsigned char color,
const int price) :
Item(id, type, 0, 0, color,
- Identified_True,
- Damaged_False,
+ Identified_true,
+ Damaged_false,
false, false, false),
mDisplayName(),
mDuplicates(),
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-16 17:50:50 +0000