Changeset 6433 in orxonox.OLD for trunk/src/story_entities/game_world.cc

Timestamp:

Jan 8, 2006, 1:50:16 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: the turret now fires too

File:

• trunk/src/story_entities/game_world.cc (modified) (3 diffs)

trunk/src/story_entities/game_world.cc

@@ -330 +330 @@
     this->tick(this->dataTank->objectManager->getObjectList(OM_COMMON), this->dtS);
     this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_00), this->dtS);
+    this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ), this->dtS);
     this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_01), this->dtS);
     this->tick(this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ), this->dtS);
@@ -366 +367 @@
 {
   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));
+
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
       this->dataTank->objectManager->getObjectList(OM_COMMON));
@@ -405 +409 @@
   engine->draw(State::getObjectManager()->getObjectList(OM_COMMON));
   engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_00));
+  engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_00_PROJ));
   engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_01));
   engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ));