diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/guild.cpp | 2 | ||||
| -rw-r--r-- | src/party.cpp | 2 | ||||
| -rw-r--r-- | src/utils/stringutils.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/guild.cpp b/src/guild.cpp index 2beee4f5..714ca010 100644 --- a/src/guild.cpp +++ b/src/guild.cpp @@ -169,7 +169,7 @@ void Guild::setRights(short rights) bool Guild::isMember(GuildMember *member) const { - if (member->mGuild > 0 && member->mGuild != this) + if (member->mGuild != nullptr && member->mGuild != this) return false; MemberList::const_iterator itr = mMembers.begin(), diff --git a/src/party.cpp b/src/party.cpp index 344bbdad..126a63c1 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -168,7 +168,7 @@ void Party::setRights(short rights) bool Party::isMember(PartyMember *member) const { - if (member->mParty > 0 && member->mParty != this) + if (member->mParty != nullptr && member->mParty != this) return false; MemberList::const_iterator itr = mMembers.begin(), diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 4f27d41b..05f1bf7b 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -136,7 +136,7 @@ int compareStrI(const std::string &a, const std::string &b) std::string::const_iterator itB = b.begin(); std::string::const_iterator endB = b.end(); - for (; itA < endA, itB < endB; ++itA, ++itB) + for (; itA < endA && itB < endB; ++itA, ++itB) { int comp = tolower(*itA) - tolower(*itB); if (comp) |