Changeset 11328 for code/branches/SpaceRace_HS16/src

Timestamp:

Dec 12, 2016, 2:17:47 PM (8 years ago)

Author:

meilel

Message:

start and finish line

Location:

code/branches/SpaceRace_HS16/src

Files:

• modules/gametypes/SpaceRaceController.cc (modified) (2 diffs)
• orxonox/infos/Bot.cc (modified) (1 diff)

code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc

@@ -169 +169 @@
                 minNextRaceCheckPoint = nextRaceCheckPoint;
             }
+
         }
 
@@ -307 +308 @@
             //orxout()<< "CP "<< currentRaceCheckpoint_->getCheckpointIndex()<<" chanched to: "<< nextRaceCheckpoint_->getCheckpointIndex()<<endl;
         }
+
         else if ((lastPositionSpaceship-this->getControllableEntity()->getPosition()).length()/dt > ADJUSTDISTANCE)
         {

code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc

@@ -70 +70 @@
             "Berkay Berabi",
             "Louis  Meile"
-            "Dr. Julius No",
+            "Dr. Julius No 3",
             "Rosa Klebb",
-            "Auric Goldfinger",
-            "Emilio Largo",
-            "Ernst Stavro Blofeld",
+            "Muten Roshi",
+            "Abradolf Lincler",
             "Dr. Kananga",
             "Francisco Scaramanga",
             "Karl Stromberg",
             "Sir Hugo Drax",
-            "Aris Kristatos",
             "Kamal Khan",
             "General Orlov",
-            "Max Zorin",
-            "Brad Whitaker",
             "General Georgi Koskov",
-            "Franz Sanchez",
+            "Karl the Llama",
             "Alec Trevelyan",
-            "Elliot Carver",
-            "Elektra King",
-            "Viktor Zokas",
-            "Gustav Graves",
+            "Thomas the Tankengine",
+            "Rick",
+            "Morty",
+            "Charlie the Unicorn",
             "Kung Fury",
-            "Mr. White",
-            "Dominic Greene"
         };
         static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));