Changeset 8999 for code/branches/presentation2011/src

Timestamp:

Dec 18, 2011, 3:22:43 PM (13 years ago)

Author:

jo

Message:

Old version of the SpaceRace added.

Location:

code/branches/presentation2011/src

Files:

• modules/gametypes/CMakeLists.txt (modified) (1 diff)
• modules/gametypes/GametypesPrereqs.h (modified) (1 diff)
• orxonox/controllers/FormationController.h (modified) (6 diffs)

code/branches/presentation2011/src/modules/gametypes/CMakeLists.txt

@@ -3 +3 @@
   RaceCheckPoint.cc
   SpaceRaceManager.cc
+  OldSpaceRace.cc
+  OldRaceCheckPoint.cc
 )
 

code/branches/presentation2011/src/modules/gametypes/GametypesPrereqs.h

@@ -66 +66 @@
 {
     class SpaceRace;
+    class OldSpaceRace;
 }
 

code/branches/presentation2011/src/orxonox/controllers/FormationController.h

@@ -77 +77 @@
 
       inline void setTeam(int team)
-           { this->team_ = team; 
-             orxout(debug_output) << "Set team to: "<<team<<" in "<<this<< endl;} 
+           { this->team_ = team; }
       inline int getTeam() const
            { return this->team_; }
@@ -87 +86 @@
                Defend-just defend the master
                Attack-leave formation, attack every target
-      */ 
+      */
       enum FormationMode {NORMAL,DEFEND,ATTACK};
-      
+
       /**
         @brief Sets the new mode. If master, set it for all slaves.
@@ -104 +103 @@
       int freedomCount_;
       enum State {SLAVE, MASTER, FREE};
-      
+
       State state_;
       std::vector<FormationController*> slaves_;
@@ -135 +134 @@
 
       void takeLeadOfFormation();
-      void masterAttacked(Pawn* originator);      
+      void masterAttacked(Pawn* originator);
 
       void specificMasterActionHold();
@@ -155 +154 @@
 
       static bool sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype); // hack
-      
+
 
       void setTarget(Pawn* target);
@@ -162 +161 @@
 
       void targetDied();
-      
+
       bool bHasTargetPosition_;
       Vector3 targetPosition_;