diff options
author | Stijn Buys <ingar@osirion.org> | 2012-10-08 19:58:08 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2012-10-08 19:58:08 +0000 |
commit | 14ea3d9d037175d4d5326ac9c83fe69ddcd0d9c4 (patch) | |
tree | ace65b7504daa0791a8dd79e4278db1ea1ef304b /src/core/entity.cc | |
parent | 66c776cc66d5c91ed3e798b0f5c5a30baf1f1d69 (diff) |
added zone flags,
renamed Entity::flag_is_set() to Entity::has_flag()
Diffstat (limited to 'src/core/entity.cc')
-rw-r--r-- | src/core/entity.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc index 3094208..7bb5278 100644 --- a/src/core/entity.cc +++ b/src/core/entity.cc @@ -550,7 +550,7 @@ void Entity::frame(const unsigned long elapsed) void Entity::reset() { - if (!radius() || flag_is_set(NonSolid)) { + if (!radius() || has_flag(NonSolid)) { return; } @@ -695,7 +695,7 @@ void EntityDynamic::set_state(int state) void EntityDynamic::reset() { - if (!radius() || flag_is_set(NonSolid)) { + if (!radius() || has_flag(NonSolid)) { return; } @@ -1169,7 +1169,7 @@ void EntityControlable::set_zone(Zone *zone) void EntityControlable::reset() { - if (!radius() || flag_is_set(NonSolid)) { + if (!radius() || has_flag(NonSolid)) { return; } |