summaryrefslogtreecommitdiff
path: root/src/net/eathena/playerhandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/eathena/playerhandler.cpp')
-rw-r--r--src/net/eathena/playerhandler.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 818fffde9..ef7afa6e4 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -101,7 +101,7 @@ void PlayerHandler::increaseSkill(const uint16_t skillId) const
void PlayerHandler::pickUp(const FloorItem *const floorItem) const
{
- if (!floorItem)
+ if (floorItem == nullptr)
return;
createOutPacket(CMSG_ITEM_PICKUP);
@@ -203,7 +203,7 @@ void PlayerHandler::pickUp(const FloorItem *const floorItem) const
EAthena::InventoryHandler *const handler =
static_cast<EAthena::InventoryHandler*>(inventoryHandler);
- if (handler)
+ if (handler != nullptr)
handler->pushPickup(floorItem->getId());
}
@@ -543,11 +543,11 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
break;
case Sp::HP:
PlayerInfo::setAttribute(Attributes::PLAYER_HP, base);
- if (localPlayer->isInParty() && Party::getParty(1))
+ if (localPlayer->isInParty() && (Party::getParty(1) != nullptr))
{
PartyMember *const m = Party::getParty(1)
->getMember(localPlayer->getId());
- if (m)
+ if (m != nullptr)
{
m->setHp(base);
m->setMaxHp(PlayerInfo::getAttribute(
@@ -558,11 +558,11 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
case Sp::MAXHP:
PlayerInfo::setAttribute(Attributes::PLAYER_MAX_HP, base);
- if (localPlayer->isInParty() && Party::getParty(1))
+ if (localPlayer->isInParty() && (Party::getParty(1) != nullptr))
{
PartyMember *const m = Party::getParty(1)->getMember(
localPlayer->getId());
- if (m)
+ if (m != nullptr)
{
m->setHp(PlayerInfo::getAttribute(Attributes::PLAYER_HP));
m->setMaxHp(base);
@@ -580,7 +580,7 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
break;
case Sp::BASELEVEL:
PlayerInfo::setAttribute(Attributes::PLAYER_LEVEL, base);
- if (localPlayer)
+ if (localPlayer != nullptr)
{
localPlayer->setLevel(base);
localPlayer->updateName();
@@ -588,7 +588,7 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
break;
case Sp::SKILLPOINT:
PlayerInfo::setAttribute(Attributes::PLAYER_SKILL_POINTS, base);
- if (skillDialog)
+ if (skillDialog != nullptr)
skillDialog->update();
break;
case Sp::STR: