diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-26 10:13:40 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-26 10:13:40 +0100 |
commit | eb2e62609992ab8b47f8805f2bc2cafce271b66f (patch) | |
tree | 58d6c387f910e3a3348a6528127f4216b524ec57 /src/guild.cpp | |
parent | 05dc1666dc794ed6aa7f6568b768c652f8922c4e (diff) | |
parent | 8d06606835e3d01f537ebe96de8b216e64a1f969 (diff) | |
download | mana-lpc2012.tar.gz mana-lpc2012.tar.bz2 mana-lpc2012.tar.xz mana-lpc2012.zip |
Merge branch 'master' into lpc2012lpc2012
Diffstat (limited to 'src/guild.cpp')
-rw-r--r-- | src/guild.cpp | 2 |
1 files changed, 1 insertions, 1 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(), |