Changeset 10368 for code/branches/towerdefenseFS15/src/orxonox

Timestamp:

Apr 16, 2015, 4:24:41 PM (9 years ago)

Author:

erbj

Message:

added timer in tick function to pause for 10 seconds between waves , trying to solve the problem, that towers are shooting at (0,0,0) (center point). The Problem seems to be in the sameteam function as the turret and the pawn at the position (0,0,0) should have the same team

File:

• code/branches/towerdefenseFS15/src/orxonox/controllers/FormationController.cc (modified) (2 diffs)

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

@@ -987 +987 @@
         }
 
-        TeamDeathmatch* tdm = orxonox_cast<TeamDeathmatch*>(gametype);
+        TeamGametype* tdm = orxonox_cast<TeamGametype*>(gametype);
         if (tdm)
         {
@@ -995 +995 @@
             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());
         }