diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-07 21:01:35 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-07 21:38:22 +0300 |
| commit | a9732d3ad6115ad7d590e819631dfbd764d13d3e (patch) | |
| tree | c62984bf527305f275a521e227d785df769c1351 /src/net | |
| parent | b43854b65e0c8bdbc37db2a0b6e2e86ebf11e7f7 (diff) | |
| download | manaplus-a9732d3ad6115ad7d590e819631dfbd764d13d3e.tar.gz manaplus-a9732d3ad6115ad7d590e819631dfbd764d13d3e.tar.bz2 manaplus-a9732d3ad6115ad7d590e819631dfbd764d13d3e.tar.xz manaplus-a9732d3ad6115ad7d590e819631dfbd764d13d3e.zip | |
remove useless checks.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/partyhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 7 | ||||
| -rw-r--r-- | src/net/eathena/charserverhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 7 | ||||
| -rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 2 |
5 files changed, 7 insertions, 13 deletions
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 6172fce34..92cf48a2d 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -194,7 +194,7 @@ void PartyHandler::processPartyInvited(Net::MessageIn &msg) { if ((being = actorSpriteManager->findBeing(id))) { - if (being && being->getType() == Being::PLAYER) + if (being->getType() == Being::PLAYER) nick = being->getName(); } } diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index f62d4d9db..6fb7ee087 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -377,11 +377,8 @@ void BeingHandler::processBeingChangeLook(Net::MessageIn &msg, default: logger->log("QQQ3 CHANGE_LOOKS: unsupported type: " "%d, id: %d", type, id); - if (dstBeing) - { - logger->log("ID: " + toString(dstBeing->getId())); - logger->log("name: " + toString(dstBeing->getName())); - } + logger->log("ID: " + toString(dstBeing->getId())); + logger->log("name: " + toString(dstBeing->getName())); break; } } diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 2fee39a03..ca4275ebe 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -286,7 +286,7 @@ void CharServerHandler::processCharLogin(Net::MessageIn &msg) Net::Character *const character = new Net::Character; readPlayerData(msg, character, false); mCharacters.push_back(character); - if (character && character->dummy) + if (character->dummy) { logger->log("CharServer: Player: %s (%d)", character->dummy->getName().c_str(), character->slot); diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index a7300f601..28f7fc999 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -377,11 +377,8 @@ void BeingHandler::processBeingChangeLook(Net::MessageIn &msg, default: logger->log("QQQ3 CHANGE_LOOKS: unsupported type: " "%d, id: %d", type, id); - if (dstBeing) - { - logger->log("ID: " + toString(dstBeing->getId())); - logger->log("name: " + toString(dstBeing->getName())); - } + logger->log("ID: " + toString(dstBeing->getId())); + logger->log("name: " + toString(dstBeing->getName())); break; } } diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 0b449bff8..d2f727af9 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -330,7 +330,7 @@ void CharServerHandler::processCharLogin(Net::MessageIn &msg) Net::Character *const character = new Net::Character; readPlayerData(msg, character, version); mCharacters.push_back(character); - if (character && character->dummy) + if (character->dummy) { logger->log("CharServer: Player: %s (%d)", character->dummy->getName().c_str(), character->slot); |