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>2010-11-08 15:24:41 +0000
committerStijn Buys <ingar@osirion.org>2010-11-08 15:24:41 +0000
commit106d0cb0cf884dd7a2920564852c001e13af1568 (patch)
tree74e813e9f57a1c43e4946850e860bd1a94ae5346 /src/core/zone.h
parentb7dc0938eb7d59f928bbcf2a3a4877a6f60940e5 (diff)
fixes crash on jumpgate usage, streamlined keepalive/upkeep frame cycle
Diffstat (limited to 'src/core/zone.h')
-rw-r--r--src/core/zone.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/core/zone.h b/src/core/zone.h
index d4b08bf..d2cdf2c 100644
--- a/src/core/zone.h
+++ b/src/core/zone.h
@@ -150,7 +150,19 @@ public:
inline btVehicleRaycaster *raycaster() {
return zone_bullet_raycaster;
}
+
+ math::BoundingBox3f & keepalive_box() {
+ return zone_keepalive_box;
+ }
+
+ const bool keepalive_run() const {
+ return zone_keepalive_run;
+ }
+ void set_keepalive_run(const bool keepalive_run) {
+ zone_keepalive_run = keepalive_run;
+ }
+
private:
unsigned int zone_id;
@@ -164,6 +176,9 @@ private:
btAxisSweep3 *zone_bullet_cache;
btDiscreteDynamicsWorld *zone_bullet_world;
btVehicleRaycaster *zone_bullet_raycaster;
+
+ math::BoundingBox3f zone_keepalive_box;
+ bool zone_keepalive_run;
};
}