Changeset 10615 for code/branches/presentationFS15merge/src/orxonox

Timestamp:

Oct 4, 2015, 12:18:01 PM (9 years ago)

Author:

landauf

Message:

merged branch towerdefenseFS15

Location:

code/branches/presentationFS15merge

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/FormationController.cc (modified) (3 diffs)

code/branches/presentationFS15merge/src/orxonox/controllers/FormationController.cc

@@ -955 +955 @@
     bool FormationController::sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype)
     {
+
+
         if (entity1 == entity2)
             return true;
@@ -984 +986 @@
         }
 
-        TeamDeathmatch* tdm = orxonox_cast<TeamDeathmatch*>(gametype);
+        TeamGametype* tdm = orxonox_cast<TeamGametype*>(gametype);
         if (tdm)
         {
@@ -992 +994 @@
             if (entity2->getPlayer())
                 team2 = tdm->getTeam(entity2->getPlayer());
-        }
-
-        Mission* miss = orxonox_cast<Mission*>(gametype);
-        if (miss)
-        {
-            if (entity1->getPlayer())
-                team1 = miss->getTeam(entity1->getPlayer());
-
-            if (entity2->getPlayer())
-                team2 = miss->getTeam(entity2->getPlayer());
         }