Changeset 11639 for code/branches/ProtectBoss_HS17/src/orxonox

Timestamp:

Dec 4, 2017, 4:23:58 PM (7 years ago)

Author:

lrigoni

Message:

Changes of 4.12.2017

Location:

code/branches/ProtectBoss_HS17/src/orxonox

Files:

• controllers/DroneController.cc (modified) (2 diffs)
• worldentities/pawns/ShootableObstacle.cc (modified) (2 diffs)

code/branches/ProtectBoss_HS17/src/orxonox/controllers/DroneController.cc

@@ -49 +49 @@
         RegisterObject(DroneController);
 
+        this->setTeam(0);
         this->owner_ = nullptr;
         this->drone_ = nullptr;
@@ -164 +165 @@
             }
         }
+        
         SUPER(AIController, tick, dt);
     }

code/branches/ProtectBoss_HS17/src/orxonox/worldentities/pawns/ShootableObstacle.cc

@@ -25 +25 @@
  */
 
+#include "ShootableObstacle.h"
+#include "core/XMLPort.h"
+
 namespace orxonox
 {
@@ -32 +35 @@
     {
         RegisterObject(ShootableObstacle);
+        this->enableCollisionCallback();
     }