Changeset 9656 in orxonox.OLD for trunk/src/world_entities/npcs/ground_turret.cc

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

• trunk/src/world_entities/npcs/ground_turret.cc (modified) (7 diffs)

trunk/src/world_entities/npcs/ground_turret.cc

@@ -39 +39 @@
  */
 GroundTurret::GroundTurret(const TiXmlElement* root)
-  : NPC(root)
+    : NPC(root)
 {
   this->init();
@@ -52 +52 @@
 GroundTurret::~GroundTurret ()
 {
-
 }
 
@@ -80 +79 @@
 
 /**
- * loads a GroundTurret from a XML-element
+ * @brief loads a GroundTurret from a XML-element
  * @param root the XML-element to load from
  * @todo make the class Loadable
@@ -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 ()
 {
-
 }