diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-11-14 16:03:19 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-11-14 16:03:19 +0000 |
| commit | 0cf596e0505f1198748931787b93f469f3e58db7 (patch) | |
| tree | 04404ff2404c824ff7a3c7c5a1703fe0a1878708 /src/core/entity.h | |
| parent | 6b737ea7f6e5a31d3c6024105ee11890f1a5451f (diff) | |
Add more Slot properties, corrected a bug in EntityControlable control flags handling.
Diffstat (limited to 'src/core/entity.h')
| -rw-r--r-- | src/core/entity.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |