Changeset 10974 for code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc

Timestamp:

Dec 14, 2015, 11:31:30 AM (9 years ago)

Author:

maxima

Message:

merged campaign and presentation

Location:

code/branches/presentationHS15

Files:

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

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

@@ -23 +23 @@
  *      Gani Aliguzhinov
  *   Co-authors:
- *      Dominik Solenicki
+ *      ...
  *
  */
@@ -73 +73 @@
     bool CommonController::sameTeam (ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype)
     {
-        //uncomment following code if functions stops working due to being a hack
-        /*if (!entity1 || !entity2)
-            return false;
-        return entity1->getTeam() == entity2->getTeam();*/
+        
         if (!entity1 || !entity2)
             return false;