Changeset 10060 for code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.cc

Timestamp:

May 15, 2014, 5:10:55 PM (10 years ago)

Author:

muemart

Message:

Fix team acquisition, edit test level and start to try to make a raytest

File:

• code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.cc (modified) (4 diffs)

code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.cc

@@ -28 +28 @@
 
 #include "TeamTargetProxy.h"
+#include "worldentities/ControllableEntity.h"
 #include "worldentities/pawns/Pawn.h"
 
- namespace orxonox
- {
-        RegisterClass(TeamTargetProxy);
+namespace orxonox
+{
+        RegisterClass(TeamTargetProxy);
 
-        TeamTargetProxy::TeamTargetProxy(Context* context) : FormationController(context)
+   /**
+       @brief 
+       Sets default values for all variables.
+
+       @param context
+       The context
+    */
+        TeamTargetProxy::TeamTargetProxy(Context* context) : FormationController(context)
         {
                 RegisterObject(TeamTargetProxy);
@@ -41 +49 @@
         }
 
+    /**
+        @brief 
+        Destructor. Nothing to see here.
+     */
         TeamTargetProxy::~TeamTargetProxy()
         {
         }
 
+    /**
+        @brief
+        Copies the team and the target from the parent.
+
+        That's all there is.
+    */
         void TeamTargetProxy::tick(float dt)
         {
@@ -51 +69 @@
 
         ControllableEntity* parent = orxonox_cast<ControllableEntity*> (this->getControllableEntity()->getParent());
-                
 
+        if(this->getTeam() != -1 && !this->once_ && parent)
+        {
+            orxout(internal_warning) << "TeamTargetProxy: Team already set, may result in undesired behaviour. Will get overridden by the parent's team." << endl;
+        }
+
+        if(!this->once_)
+            this->once_ = true;
+
+        //Teams aren't set immediately, after creation, so we have to check every tick...
+        if(parent)
+        {
+            Controller* parentcontroller = parent->getController();
+            if(parentcontroller)
+            {
+                this->setTeam(parentcontroller->getTeam());
+            }
+            else
+            {
+                this->setTeam(parent->getTeam());
+            }
+            this->getControllableEntity()->setTeam(parent->getTeam());
+        }
 
         if(parent)
         {
-
-            if(!this->once_)
-            {
-                //Set the same team
-                if(parent)
-                {
-                    Controller* parentcontroller = parent->getController();
-                    if(parentcontroller)
-                    {
-                        this->setTeam(parentcontroller->getTeam());
-                    }
-                    else
-                    {
-                        this->setTeam(parent->getTeam());
-                    }
-                    this->getControllableEntity()->setTeam(parent->getTeam());
-                }
-                this->once_ = true;
-            }
-
             Pawn* parenttarget = orxonox_cast<Pawn*>(parent->getTarget());
             if(parenttarget)
@@ -83 +102 @@
             }
         }
-
         }
- }
+}