diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-11-12 19:50:04 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-11-12 19:50:04 +0000 |
| commit | e6516fb9999ae47a828e032f0908d2f2ae4b2434 (patch) | |
| tree | 80aaed66e95541d93bd56de6fb8cad997e078856 /src/core/gameserver.cc | |
| parent | b460b3193e54b7364bb75ff26ce6f999887e454b (diff) | |
enables entity model scaling, Entity::radius() gets precedence over Model::radius(),
corrected bullet motionstate transfer bug in Entity::reset(),
minor cleanups
Diffstat (limited to 'src/core/gameserver.cc')
| -rw-r--r-- | src/core/gameserver.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc index 7d6fc96..e07774d 100644 --- a/src/core/gameserver.cc +++ b/src/core/gameserver.cc @@ -546,6 +546,7 @@ void GameServer::frame(unsigned long timestamp) Entity *entity = (*it).second; Zone *zone = entity->zone(); if (zone && entity->flag_is_set(Entity::KeepAlive)) { + if (zone->keepalive_run() && zone->keepalive_box().inside(entity->location())) { entity->set_keepalive(server_timestamp); } |