Changeset 11720 for code/trunk/src/orxonox

Timestamp:

Feb 4, 2018, 4:58:37 PM (7 years ago)

Author:

landauf

Message:

[SpaceRace_HS16] reverted some unwanted changes and fixed formatting a little bit

Location:

code/trunk/src/orxonox

Files:

• controllers/HumanController.h (modified) (1 diff)
• infos/Bot.cc (modified) (1 diff)
• infos/GametypeInfo.h (modified) (2 diffs)

code/trunk/src/orxonox/controllers/HumanController.h

@@ -92 +92 @@
             //friend class, for mouselook
             friend class Map;
-            static HumanController* localController_s;
 
         protected:
+            static HumanController* localController_s;
             bool controlPaused_;
 

code/trunk/src/orxonox/infos/Bot.cc

@@ -68 +68 @@
         static const std::string names[] =
         {
+            "Dr. Julius No",
+            "Rosa Klebb",
+            "Auric Goldfinger",
+            "Emilio Largo",
+            "Ernst Stavro Blofeld",
+            "Dr. Kananga",
+            "Francisco Scaramanga",
+            "Karl Stromberg",
+            "Sir Hugo Drax",
+            "Aris Kristatos",
+            "Kamal Khan",
+            "General Orlov",
+            "Max Zorin",
+            "Brad Whitaker",
+            "General Georgi Koskov",
+            "Franz Sanchez",
+            "Alec Trevelyan",
+            "Elliot Carver",
+            "Elektra King",
+            "Viktor Zokas",
+            "Gustav Graves",
+            "Le Chiffre",
+            "Mr. White",
+            "Dominic Greene",
             "Berkay Berabi",
-            "Louis  Meile"
+            "Louis  Meile",
             "Muten Roshi",
             "Abradolf Lincler",
             "Lionel Messi",
-            "Kamal Khan",
             "Karl the Llama",
             "Thomas the Tankengine",

code/trunk/src/orxonox/infos/GametypeInfo.h

@@ -83 +83 @@
             inline bool isStartCountdownRunning() const
                 { return this->bStartCountdownRunning_; }
-            
             void changedStartCountdownRunning(void); // Is called when the start countdown has been either started or stopped.
 
@@ -133 +132 @@
             void dispatchStaticMessage(const std::string& message,const ColourValue& colour) const;
             void dispatchFadingMessage(const std::string& message) const;
-            void setStartCountdown(float countdown); // Set the start countdown to the input value.
-
 
         protected:
             void start(void); // Inform the GametypeInfo that the game has started.
             void end(void); // Inform the GametypeInfo that the game has ended.
+            void setStartCountdown(float countdown); // Set the start countdown to the input value.
             void countdownStartCountdown(float countDown); // Count down the start countdown by the specified value.
             void countDown(); // Count down the start countdown counter.