From ef499c2839524dd056437395a08834a797a0d024 Mon Sep 17 00:00:00 2001 From: Bernd Lörwald Date: Mon, 10 Nov 2014 16:07:13 +0100 Subject: Utilities/flag128: fix: HasFlag(): s/&&/||/ --- src/server/shared/Utilities/Util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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) -- cgit v1.2.3