Changeset 8990 for code/branches/formation/src/orxonox/controllers/FormationController.cc

Timestamp:

Dec 16, 2011, 4:25:28 PM (12 years ago)

Author:

jo

Message:

Rough adding of both concepts. Further work on the states is needed. (single player bots are inactive at the moment)

File:

• code/branches/formation/src/orxonox/controllers/FormationController.cc (modified) (3 diffs)

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

@@ -40 +40 @@
 #include "gametypes/TeamDeathmatch.h"
 #include "gametypes/Dynamicmatch.h"
+//#include "gametypes/Mission.h" TODO: include mission after merging
 #include "gametypes/Gametype.h"
 #include "controllers/WaypointPatrolController.h"
@@ -961 +962 @@
         }
 
-        Mission* miss = orxonox_cast<Mission*>(gametype); //NEW
+        /*Mission* miss = orxonox_cast<Mission*>(gametype); //NEW
         if (miss)
         {
@@ -969 +970 @@
             if (entity2->getPlayer())
                 team2 = miss->getTeam(entity2->getPlayer());
-        }
+        }*/
 
         TeamBaseMatchBase* base = 0;