From 0cf596e0505f1198748931787b93f469f3e58db7 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 14 Nov 2012 16:03:19 +0000 Subject: Add more Slot properties, corrected a bug in EntityControlable control flags handling. --- src/core/entity.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/entity.h') diff --git a/src/core/entity.h b/src/core/entity.h index 72553fa..d90de8b 100644 --- a/src/core/entity.h +++ b/src/core/entity.h @@ -703,8 +703,8 @@ public: } /// returns true if the specified control flag is set - inline bool has_controlflag(ControlFlags flag) const { - return ((flag && entity_controlflags) == flag); + inline bool has_controlflag(ControlFlags controlflag) const { + return ((controlflag & entity_controlflags) == controlflag); } /// physics action -- cgit v1.2.3