diff options
| author | Bernd Lörwald <bloerwald@googlemail.com> | 2014-11-10 16:07:13 +0100 |
|---|---|---|
| committer | Bernd Lörwald <bloerwald@googlemail.com> | 2014-11-10 16:07:13 +0100 |
| commit | ef499c2839524dd056437395a08834a797a0d024 (patch) | |
| tree | d62b4d2af9b2ba0a50fb5aabcad1b747f4771bed /src | |
| parent | b4a9f471238aeefcadab765fc8ec2ae4b1af79bd (diff) | |
Utilities/flag128: fix: HasFlag(): s/&&/||/
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/shared/Utilities/Util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index 57ac731f81a..936fc691347 100644 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -550,7 +550,7 @@ public: inline bool HasFlag(uint32 p1 = 0, uint32 p2 = 0, uint32 p3 = 0, uint32 p4 = 0) const { - return (part[0] & p1 || part[1] & p2 || part[2] & p3 && part[3] & p4); + return (part[0] & p1 || part[1] & p2 || part[2] & p3 || part[3] & p4); } inline void Set(uint32 p1 = 0, uint32 p2 = 0, uint32 p3 = 0, uint32 p4 = 0) |