Changeset 9612 in orxonox.OLD for branches

Timestamp:

Jul 30, 2006, 12:04:42 PM (18 years ago)

Author:

bensch

Message:

new range

Location:

branches/proxy/src/world_entities

Files:

• npcs/network_turret.cc (modified) (1 diff)
• weapons/aim.cc (modified) (1 diff)

branches/proxy/src/world_entities/npcs/network_turret.cc

@@ -109 +109 @@
 void NetworkTurret::tick(float dt)
 {
-  if(this->getHealth() > 0.0f
-    ) // HACK <--- YOU ARE THE MOTHERFUCKER
+  ObjectManager::EntityList::iterator entity;
+  Vector diffVec;
+  for (entity = State::getObjectManager()->getObjectList((OM_LIST)this->targetGroup).begin();
+       entity != State::getObjectManager()->getObjectList((OM_LIST)this->targetGroup).end();
+       entity ++)
   {
-    if (likely(this->weapon != NULL))
+    diffVec = ( (*entity)->getAbsCoor() - this->getAbsCoor() );
+
+    if ( diffVec.len() < 1000 )//&&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) )  < angle)
     {
-      //    this->left->tickW(dt);
-      this->weapon->requestAction(WA_SHOOT);
+      //if (this->getParent() != (*entity))
+      {
+        printf("found target::: %d %s::%s\n", (*entity)->getOMListNumber(), (*entity)->getClassCName(), (*entity)->getCName());
+
+        this->weapon->requestAction(WA_SHOOT);
+        return;
+      }
     }
   }

branches/proxy/src/world_entities/weapons/aim.cc

@@ -69 +69 @@
   this->source = NULL;
 
-  this->range = 10000;
+  this->range = 1000;
   this->angle = M_PI_4;
   this->targetGroup = OM_GROUP_01;