Changeset 11720

Timestamp:

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

Author:

landauf

Message:

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

Location:

code/trunk/src

Files:

• modules/gametypes/SpaceRace.cc (modified) (10 diffs)
• modules/gametypes/SpaceRace.h (modified) (1 diff)
• modules/gametypes/SpaceRaceBot.cc (modified) (2 diffs)
• modules/gametypes/SpaceRaceBot.h (modified) (2 diffs)
• modules/gametypes/SpaceRaceController.cc (modified) (2 diffs)
• orxonox/controllers/HumanController.h (modified) (1 diff)
• orxonox/infos/Bot.cc (modified) (1 diff)
• orxonox/infos/GametypeInfo.h (modified) (2 diffs)

code/trunk/src/modules/gametypes/SpaceRace.cc

@@ -80 +80 @@
         RegisterObject(SpaceRace);
 
-        this->botclass_ = Class(SpaceRaceBot); //ClassByString("")
+        this->botclass_ = Class(SpaceRaceBot);
         this->cantMove_ = false;
         this->bTimeIsUp_ = false;
-        this->setConfigValues();
 
         this->numberOfBots_ = 5; // quick fix: don't allow default-bots to enter the race 
@@ -89 +88 @@
     }
 
-  void SpaceRace::setConfigValues()
-    {
-       
-    
-    }
-
     void SpaceRace::start()
     {
-    // define spawn positions of the 5 bots
+        // define spawn positions of the 5 bots
 
         int startpos[15];
@@ -120 +113 @@
         startpos[13] =-40;
         startpos[14] =80;
-        
-
-
 
         Gametype::start();
-   if (true)
-        {
-            this->spawnPlayersIfRequested();
-            this->cantMove_ = true;
-            //players are unable to move while countdown is running
-            for (Engine* engine : ObjectList<Engine>()){
-                engine->setActive(false);
-                
-
-            }
-           //append spawn positions to bots
-           int a,b,c;
-            a=0;
-            b=1;
-            c=2;
-              for (SpaceRaceBot* bot : ObjectList<SpaceRaceBot>()){
-                bot->getControllableEntity()->setPosition(startpos[a],startpos[b],startpos[c]);
-               a= a+3;
-               b = b+3; 
-               c+= 3;
-            }
-
-
-        }
-
-                                                
+
+        this->spawnPlayersIfRequested();
+        this->cantMove_ = true;
+        //players are unable to move while countdown is running
+        for (Engine* engine : ObjectList<Engine>())
+        {
+            engine->setActive(false);
+        }
+
+        //append spawn positions to bots
+        int a,b,c;
+        a=0;
+        b=1;
+        c=2;
+
+        for (SpaceRaceBot* bot : ObjectList<SpaceRaceBot>())
+        {
+            bot->getControllableEntity()->setPosition(startpos[a], startpos[b], startpos[c]);
+            a += 3;
+            b += 3;
+            c += 3;
+        }
 
         std::string message("Use headphones to hear the countdown!");
@@ -156 +142 @@
         ChatManager::message(message);
 
-//after 11 seconds , countdownFinished function is called to activate bots` engines
-Timer* countdownTimer = new Timer();
+        //after 11 seconds , countdownFinished function is called to activate bots` engines
+        Timer* countdownTimer = new Timer();
         countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));
     }
@@ -189 +175 @@
     }
 
-
-void SpaceRace::tick(float dt)
-    {
-        SUPER(SpaceRace,tick,dt);
-}
-
     void SpaceRace::newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player)
     {
@@ -207 +187 @@
         const std::string& message = player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 
         + "after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.";
- this->getGametypeInfo()->sendAnnounceMessage(message);
-        ChatManager::message(message);
-
-    }
-
- void SpaceRace::countdownFinished()//activates the engines of all players 
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+
+    }
+
+    void SpaceRace::countdownFinished()//activates the engines of all players
     {
 
@@ -220 +200 @@
 
 
-    for (Engine* engine : ObjectList<Engine>())
-                engine->setActive(true);
-
-
-    
-}
-
- void SpaceRace::playerEntered(PlayerInfo* player)
+        for (Engine* engine : ObjectList<Engine>())
+            engine->setActive(true);
+    }
+
+    void SpaceRace::playerEntered(PlayerInfo* player)
     {
         Gametype::playerEntered(player);
@@ -236 +213 @@
 
 
- void SpaceRace::addBots(unsigned int amount) //function that add the bots to the game 
+    void SpaceRace::addBots(unsigned int amount) //function that add the bots to the game
     {
         for (unsigned int i = 1; i <= amount; ++i){
@@ -244 +221 @@
 
 
-//set bot configurations
+    //set bot configurations
     bool SpaceRace::allowPawnHit(Pawn* victim, Pawn* originator)
     {
@@ -255 +232 @@
     }
 
-    bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)// false because the bots can not recognize the objects and die to early 
-                                                                    //if they can 
+    bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)// false because the bots can not recognize the objects and die to earlyif they can
     {
         return false;

code/trunk/src/modules/gametypes/SpaceRace.h

@@ -57 +57 @@
             virtual ~SpaceRace() {}
 
-             void setConfigValues();
-
-            virtual void tick(float dt) override;
             virtual void start() override;
             virtual void end() override;
- virtual void countdownFinished();
-             virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command.
+            virtual void countdownFinished();
+            virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command.
 
 
 
-             virtual void playerEntered(PlayerInfo* player) override;
+            virtual void playerEntered(PlayerInfo* player) override;
 
             //virtual void newCheckpointReached();

code/trunk/src/modules/gametypes/SpaceRaceBot.cc

@@ -23 +23 @@
  *      Author: purgham
  */
-#include <vector>
 
 #include "SpaceRaceBot.h"
-#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
-#include "core/config/ConfigValueIncludes.h"
-#include "gametypes/Gametype.h"
-#include "controllers/AIController.h"
-#include "gametypes/SpaceRaceController.h"
-
-
-
 
 namespace orxonox
@@ -42 +33 @@
     SpaceRaceBot::SpaceRaceBot(Context* context) : Bot(context){
         RegisterObject(SpaceRaceBot);
-        this->defaultController_ = Class(SpaceRaceController);// ClassByString("")
+        this->defaultController_ = Class(SpaceRaceController);
         this->createController();
-
-    }
-
-SpaceRaceBot::~SpaceRaceBot(){
-
-}
-
-void SpaceRaceBot::setConfigValues()
-    {
-        static const std::string names[] =
-        {
-            "Dr. Julius No",
-            "Berkay Berabi",
-            "Louis Meile"         
-            "Yo mama"
-        };
-        static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));
-
-        SetConfigValue(names_, defaultnames);
     }
 }

code/trunk/src/modules/gametypes/SpaceRaceBot.h

@@ -30 +30 @@
 #include "gametypes/GametypesPrereqs.h"
 #include "gametypes/SpaceRaceController.h"
-#include <vector>
 
 
@@ -40 +39 @@
         public:
             SpaceRaceBot(Context* context);
-            virtual ~SpaceRaceBot();
-    
-            void setConfigValues();
-
-
-
- virtual inline bool isInitialized() const override
-                { return true; }
-            virtual inline float getPing() const override
-                { return 0; }
-            virtual inline float getPacketLossRatio() const override
-                { return 0; }
-
-
-  private:
-            std::vector<std::string> names_;
-
-
+            virtual ~SpaceRaceBot() {}
     };
 }

code/trunk/src/modules/gametypes/SpaceRaceController.cc

@@ -16 +16 @@
  *   GNU General Public License for more details.
  *
- *   You should have     a copy of the GNU General Public License
+ *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -327 +327 @@
         lastPositionSpaceship = this->getControllableEntity()->getPosition();
        
-this->boostControl();
+        this->boostControl();
         this->moveToPosition(nextRaceCheckpoint_->getPosition());
         this->boostControl();

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.