Changeset 10843 for code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc

Timestamp:

Nov 23, 2015, 9:08:28 PM (8 years ago)

Author:

gania

Message:

gani check in before a major change

File:

• code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) (2 diffs)

code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc

@@ -69 +69 @@
         //orxout(internal_error) << "I died, my Rank is " << rank_ << endl;
     }
-
+   
     void CommonController::XMLPort( Element& xmlelement, XMLPort::Mode mode )
     {
@@ -85 +85 @@
     void CommonController::tick(float dt)
     {
-
+        if (this->bHasTargetPosition_)
+        {
+            this->moveToTargetPosition(dt);
+        }
+        else if (this->bLookAtTarget_)
+        {
+            this->lookAtTarget(dt);
+        }
+        if (bShooting_)
+        {
+            this->doFire();
+        }
+        SUPER(CommonController, tick, dt);
     }