Changeset 7005 in orxonox.OLD for branches/current_cd/src/story_entities/game_world.cc

Timestamp:

Feb 3, 2006, 9:34:57 AM (18 years ago)

Author:

patrick

Message:

cd: work flush

File:

• branches/current_cd/src/story_entities/game_world.cc (modified) (2 diffs)

branches/current_cd/src/story_entities/game_world.cc

@@ -381 +381 @@
 {
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
-  this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
+    this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
-  this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
-
+    this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
-      this->dataTank->objectManager->getObjectList(OM_COMMON));
+    this->dataTank->objectManager->getObjectList(OM_COMMON));
 }
 
@@ -428 +427 @@
   {
     CDEngine* engine = CDEngine::getInstance();
-    //engine->drawBV(State::getObjectManager()->getObjectList(OM_ENVIRON_NOTICK));
+    engine->drawBV(State::getObjectManager()->getObjectList(OM_ENVIRON_NOTICK));
     engine->drawBV(State::getObjectManager()->getObjectList(OM_ENVIRON));
     engine->drawBV(State::getObjectManager()->getObjectList(OM_COMMON));
     engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_00));
+    engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_00_PROJ));
     engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_01));
     engine->drawBV(State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ));