diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-02-24 19:13:27 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-02-24 19:13:27 +0000 |
| commit | 53faab4c1d692fed7c7ecfedea57fc457bf61e80 (patch) | |
| tree | d5dab7709dd4dc5409ab0e62920bb4d62790a90a /src/core/entity.h | |
| parent | 0e96454c70e56de5cefa38ab1b5dc46196238d07 (diff) | |
Replaced 'The Osirion Project' with 'Project::OSiRioN' in messages,
added g_collision cflag to facillitate future development,
added ShowOnMap entity flag
Diffstat (limited to 'src/core/entity.h')
| -rw-r--r-- | src/core/entity.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/entity.h b/src/core/entity.h index bd26abe..596a701 100644 --- a/src/core/entity.h +++ b/src/core/entity.h @@ -39,7 +39,7 @@ class Entity public: /// Entity flags - enum Flags {Static=1, Solid=2, Bright=4, Dockable=8}; + enum Flags {Static=1, Solid=2, Bright=4, Dockable=8, ShowOnMap=16}; /// Entity type constants enum Type {Default=0, Dynamic=1, Controlable=2, Globe=3}; @@ -76,6 +76,9 @@ public: /// entity flags inline unsigned int flags() const { return entity_flags; } + /// returns true of a flag is set + inline bool flag_is_set(const Flags flag) const { return ((entity_flags & (unsigned int)flag) == (unsigned int)flag); } + /// entity label (can not contain double quotes ") inline std::string const & label() { return entity_label; } |