Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-10-08 19:58:08 +0000
committerStijn Buys <ingar@osirion.org>2012-10-08 19:58:08 +0000
commit14ea3d9d037175d4d5326ac9c83fe69ddcd0d9c4 (patch)
treeace65b7504daa0791a8dd79e4278db1ea1ef304b /src/core/gameserver.cc
parent66c776cc66d5c91ed3e798b0f5c5a30baf1f1d69 (diff)
added zone flags,
renamed Entity::flag_is_set() to Entity::has_flag()
Diffstat (limited to 'src/core/gameserver.cc')
-rw-r--r--src/core/gameserver.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index f9cc061..579f65d 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -641,7 +641,7 @@ void GameServer::frame(const unsigned long timestamp)
for (Entity::Registry::iterator it = Entity::registry().begin(); it != Entity::registry().end(); it++) {
Entity *entity = (*it).second;
Zone *zone = entity->zone();
- if (zone && entity->flag_is_set(Entity::KeepAlive)) {
+ if (zone && entity->has_flag(Entity::KeepAlive)) {
if (zone->keepalive_run() && zone->keepalive_box().inside(entity->location())) {
entity->set_keepalive(this->timestamp());