Changeset 6433 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: the turret now fires too

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (3 diffs)
• world_entities/npcs/ground_turret.cc (modified) (3 diffs)
• world_entities/weapons/guided_missile.cc (modified) (1 diff)
• world_entities/weapons/rocket.cc (modified) (1 diff)
• world_entities/weapons/weapon.cc (modified) (2 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));

trunk/src/world_entities/npcs/ground_turret.cc

@@ -92 +92 @@
     this->left->toList(this->getOMListNumber());
     this->left->setRelCoor(0,10,-5);
+    this->left->requestAction( WA_ACTIVATE);
   }
 
@@ -102 +103 @@
     this->right->toList(this->getOMListNumber());
     this->right->setRelCoor(0,10,5);
+    this->left->requestAction( WA_ACTIVATE);
   }
 }
@@ -109 +111 @@
  * @param time the Time to step
  */
-void GroundTurret::tick(float time)
-{
+void GroundTurret::tick(float dt)
+{
+  if (likely(this->left != NULL))
+  {
+    this->left->tickW(dt);
+    this->left->requestAction(WA_SHOOT);
+  }
+  if (likely(this->right != NULL))
+  {
+    this->right->tickW(dt);
+    this->right->requestAction(WA_SHOOT);
+  }
 
 }

trunk/src/world_entities/weapons/guided_missile.cc

@@ -134 +134 @@
 void GuidedMissile::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (this->hitEntity != entity && entity->isA(CL_NPC))
+  if (this->hitEntity != entity)
     this->destroy();
   this->hitEntity = entity;

trunk/src/world_entities/weapons/rocket.cc

@@ -132 +132 @@
 void Rocket::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (this->hitEntity != entity && entity->isA(CL_NPC))
+  if (this->hitEntity != entity)
     this->destroy();
   this->hitEntity = entity;

trunk/src/world_entities/weapons/weapon.cc

@@ -373 +373 @@
 //  if (this->currentState == WS_INACTIVE)
   {
-        // play Sound
+    // play Sound
     if (likely(this->soundBuffers[WA_ACTIVATE] != NULL))
       this->soundSource->play(this->soundBuffers[WA_ACTIVATE]);
@@ -564 +564 @@
 void Weapon::debug() const
 {
-  PRINT(3)("Weapon-Debug %s, state: %s, nextAction: %s\n", this->getName(), Weapon::stateToChar(this->currentState), Weapon::actionToChar(requestedAction));
-  PRINT(3)("Energy: max: %f; current: %f;  loadedMax: %f; loadedCurrent: %f; chargeMin: %f, chargeMax %f\n",
+  PRINT(0)("Weapon-Debug %s, state: %s (duration: %fs), nextAction: %s\n", this->getName(), Weapon::stateToChar(this->currentState), this->stateDuration, Weapon::actionToChar(requestedAction));
+  PRINT(0)("Energy: max: %f; current: %f;  loadedMax: %f; loadedCurrent: %f; chargeMin: %f, chargeMax %f\n",
             this->energyMax, this->energy, this->energyLoadedMax, this->energyLoaded, this->minCharge, this->maxCharge);