Changeset 9518 in orxonox.OLD

Timestamp:

Jul 27, 2006, 6:58:04 PM (18 years ago)

Author:

bensch

Message:

targetting turrets are firing all the time now, but the hack is out :/

Location:

branches/proxy/src/world_entities

Files:

• npcs/ground_turret.cc (modified) (6 diffs)
• weapons/aim.cc (modified) (3 diffs)
• weapons/targeting_turret.h (modified) (1 diff)

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

@@ -39 +39 @@
  */
 GroundTurret::GroundTurret(const TiXmlElement* root)
-  : NPC(root)
+    : NPC(root)
 {
   this->init();
@@ -52 +52 @@
 GroundTurret::~GroundTurret ()
 {
-
 }
 
@@ -88 +87 @@
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
   NPC::loadParams(root);
-
 
   /**
@@ -126 +124 @@
 void GroundTurret::tick(float dt)
 {
-  if(this->getHealth() > 0.0f && State::getPlayer() &&
-     State::getPlayer()->getPlayable() &&
-     State::getPlayer()->getPlayable()->distance(this) < 120) // HACK
+  if(this->getHealth() > 0.0f
+    ) // HACK <--- YOU ARE THE MOTHERFUCKER
   {
-  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);
-  }
+    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);
+    }
   }
 }
@@ -164 +161 @@
 void GroundTurret::postSpawn ()
 {
-
 }
 
@@ -173 +169 @@
 void GroundTurret::leftWorld ()
 {
-
 }
 

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

@@ -71 +71 @@
   this->range = 10000;
   this->angle = M_PI_4;
-  this->targetGroup = OM_GROUP_02_PROJ;
+  this->targetGroup = OM_GROUP_01;
   this->anim = new tAnimation<Aim>(this, &Aim::setSize);
   this->anim->setInfinity(ANIM_INF_CONSTANT);
@@ -132 +132 @@
 void Aim::setTargetGroupS(const std::string& groupName)
 {
-  printf("::::::::::::::::::::::: TEST\n");
   OM_LIST id = ObjectManager::StringToOMList(groupName);
   if (id != OM_NULL)
@@ -138 +137 @@
   else
     PRINTF(2)("List %s not found for targetting\n", groupName.c_str());
-
-  printf("targetGroup: %s, %d", groupName.c_str(), id);
 }
 

branches/proxy/src/world_entities/weapons/targeting_turret.h

@@ -26 +26 @@
   virtual void draw() const;
 
+  const PNode* getLockedTarget() const { return lockedTarget; };
+
 private:
   void init();