Changeset 11764 for code/branches/Presentation_HS17_merge/src/orxonox/controllers

Timestamp:

Feb 18, 2018, 1:17:48 AM (7 years ago)

Author:

landauf

Message:

merged ProtectBoss_HS17

Location:

code/branches/Presentation_HS17_merge

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/DroneController.cc (modified) (2 diffs)

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

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