summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/partyhandler.cpp2
-rw-r--r--src/net/playerhandler.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index 03aca66d..fe7db55d 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -69,7 +69,7 @@ void PartyHandler::handleMessage(MessageIn *msg)
{
int id = msg->readInt32();
Being *being = beingManager->findBeing(id);
- if (being == NULL)
+ if (!being)
{
break;
}
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 46ded32e..470a4aa4 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -191,9 +191,9 @@ void PlayerHandler::handleMessage(MessageIn *msg)
player_node->mMaxWeight / 2)
{
weightNotice = new OkDialog(_("Message"),
- _("You are carrying more then half "
- "your weight. You are unable to "
- "regain health."));
+ _("You are carrying more then "
+ "half your weight. You are "
+ "unable to regain health."));
weightNotice->addActionListener(
&weightListener);
}
@@ -391,7 +391,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
BY_SERVER);
break;
default:
- logger->log(_("0x013b: Unhandled message %i"), type);
+ logger->log("0x013b: Unhandled message %i", type);
break;
}
}