From 14ea3d9d037175d4d5326ac9c83fe69ddcd0d9c4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 8 Oct 2012 19:58:08 +0000 Subject: added zone flags, renamed Entity::flag_is_set() to Entity::has_flag() --- src/core/entity.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/entity.cc') 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; } -- cgit v1.2.3