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-07 21:38:00 +0000
committerStijn Buys <ingar@osirion.org>2012-10-07 21:38:00 +0000
commit9ce4282b3c309bb838888264f2e68c0b458224ac (patch)
treeb9643018cf525ab1168dd68fd170eb89b6edca97 /src/core/zone.cc
parente0675cdd516c8ba9f9840c48de6054356878bda2 (diff)
Updated code comments, added zone information record.
Diffstat (limited to 'src/core/zone.cc')
-rw-r--r--src/core/zone.cc14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/core/zone.cc b/src/core/zone.cc
index 8050716..2059e03 100644
--- a/src/core/zone.cc
+++ b/src/core/zone.cc
@@ -15,8 +15,12 @@ namespace core
/* ---- Static functions for the Zone registry ------------------- */
+// zone registry
Zone::Registry Zone::zone_registry;
+// info type for zone information
+const InfoType *Zone::zone_infotype = 0;
+
void Zone::add(Zone *zone)
{
unsigned int id = 1;
@@ -122,6 +126,7 @@ Zone::Zone(std::string const & label) :
{
zone_id = 0;
zone_defaultview = 0;
+ zone_info = 0 ;
btVector3 worldAabbMin(-10000, -10000, -10000);
btVector3 worldAabbMax(10000, 10000, 10000);
@@ -133,7 +138,6 @@ Zone::Zone(std::string const & label) :
// disable gravity
zone_bullet_world->setGravity(btVector3(0.0f, 0.0f, 0.0f));
-
}
Zone::Zone(std::istream & is) :
@@ -142,6 +146,8 @@ Zone::Zone(std::istream & is) :
{
zone_id = 0;
zone_defaultview = 0;
+ zone_info = 0 ;
+
// client side does not setup a bullet physics environment
zone_bullet_cache = 0;
zone_bullet_world = 0;
@@ -169,6 +175,12 @@ Zone::~Zone()
delete zone_bullet_cache;
}
+void Zone::set_info(const Info *info)
+{
+ zone_info = info;
+}
+
+
void Zone::print()
{
con_print << " zone id ^B" << id() << " ^Nlabel ^B" << label() << " ^Nname ^B" << name() << std::endl;