summaryrefslogtreecommitdiff
path: root/src/resources/item
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/item')
-rw-r--r--src/resources/item/cardslist.h2
-rw-r--r--src/resources/item/complexitem.cpp4
-rw-r--r--src/resources/item/item.cpp12
-rw-r--r--src/resources/item/shopitem.cpp6
4 files changed, 12 insertions, 12 deletions
diff --git a/src/resources/item/cardslist.h b/src/resources/item/cardslist.h
index f4c488404..6bc1f5e22 100644
--- a/src/resources/item/cardslist.h
+++ b/src/resources/item/cardslist.h
@@ -42,7 +42,7 @@ struct CardsList final
explicit CardsList(const int *const cards0)
{
- if (cards0)
+ if (cards0 != nullptr)
{
for (int f = 0; f < maxCards; f ++)
cards[f] = cards0[f];
diff --git a/src/resources/item/complexitem.cpp b/src/resources/item/complexitem.cpp
index 08901a90e..047c50614 100644
--- a/src/resources/item/complexitem.cpp
+++ b/src/resources/item/complexitem.cpp
@@ -57,7 +57,7 @@ ComplexItem::~ComplexItem()
void ComplexItem::addChild(const Item *const item,
const int amount)
{
- if (!item)
+ if (item == nullptr)
return;
increaseQuantity(amount);
Item *child = nullptr;
@@ -72,7 +72,7 @@ void ComplexItem::addChild(const Item *const item,
break;
}
}
- if (child)
+ if (child != nullptr)
{
child->increaseQuantity(amount);
}
diff --git a/src/resources/item/item.cpp b/src/resources/item/item.cpp
index c2c25a78c..897340732 100644
--- a/src/resources/item/item.cpp
+++ b/src/resources/item/item.cpp
@@ -78,7 +78,7 @@ Item::Item(const int id,
Item::~Item()
{
- if (mImage)
+ if (mImage != nullptr)
{
mImage->decRef();
mImage = nullptr;
@@ -97,7 +97,7 @@ void Item::setId(const int id,
mEquipment = fromBool(id && CAST_S32(getInfo().getType())
>= 2, Equipm);
- if (mImage)
+ if (mImage != nullptr)
mImage->decRef();
const ItemInfo &info = getInfo();
@@ -108,7 +108,7 @@ void Item::setId(const int id,
info.getDyeIconColorsString(color));
mImage = Loader::getImage(dye);
- if (!mImage)
+ if (mImage == nullptr)
{
mImage = Theme::getImageFromTheme(paths.getValue("unknownItemFile",
"unknown-item.png"));
@@ -131,7 +131,7 @@ Image *Item::getImage(const int id,
"itemIcons"), info.getDisplay().image),
info.getDyeIconColorsString(color)));
- if (!image)
+ if (image == nullptr)
image = Theme::getImageFromTheme("unknown-item.png");
return image;
}
@@ -167,7 +167,7 @@ int Item::getCard(const int index) const
void Item::setCards(const int *const cards, const int size)
{
- if (size < 0 || !cards)
+ if (size < 0 || (cards == nullptr))
return;
int sz = size;
if (sz > maxCards)
@@ -180,7 +180,7 @@ void Item::addCard(const int card)
{
for (int f = 0; f < maxCards; f ++)
{
- if (!mCards[f])
+ if (mCards[f] == 0)
{
mCards[f] = card;
return;
diff --git a/src/resources/item/shopitem.cpp b/src/resources/item/shopitem.cpp
index 0c013ee89..99e0c43dd 100644
--- a/src/resources/item/shopitem.cpp
+++ b/src/resources/item/shopitem.cpp
@@ -102,7 +102,7 @@ void ShopItem::updateDisplayName(const int quantity)
else
#endif // TMWA_SUPPORT
mDisplayName = std::string(getInfo().getName(mColor));
- if (mPrice)
+ if (mPrice != 0)
{
mDisplayName.append(" (").append(
UnitsDb::formatCurrency(mCurrency, mPrice)).append(") ");
@@ -138,7 +138,7 @@ void ShopItem::addDuplicate()
int ShopItem::sellCurrentDuplicate(const int quantity)
{
DuplicateItem* dupl = mDuplicates.top();
- if (!dupl)
+ if (dupl == nullptr)
return 0;
const int sellCount = quantity <= dupl->quantity
@@ -155,7 +155,7 @@ int ShopItem::sellCurrentDuplicate(const int quantity)
void ShopItem::increaseUsedQuantity(const int amount)
{
- if (mShowQuantity && mQuantity)
+ if (mShowQuantity && (mQuantity != 0))
{
if (mQuantity < mUsedQuantity + amount ||
mUsedQuantity + amount < 0)