Changeset 11499 for code/branches/HUD_HS16/src/orxonox

Timestamp:

Oct 23, 2017, 2:56:00 PM (7 years ago)

Author:

patricwi

Message:

reset back in time

Location:

code/branches/HUD_HS16

Files:

• . (modified) (1 prop)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/Highscore.cc (deleted)
• src/orxonox/Highscore.h (deleted)
• src/orxonox/LevelInfo.cc (modified) (2 diffs)
• src/orxonox/LevelInfo.h (modified) (4 diffs)
• src/orxonox/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/gamestates/GSLevel.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSLevel.h (modified) (1 diff)
• src/orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gametypes/Gametype.cc (modified) (1 diff)
• src/orxonox/gametypes/StoryMode.cc (deleted)
• src/orxonox/gametypes/StoryMode.h (deleted)
• src/orxonox/infos/Bot.cc (modified) (1 diff)
• src/orxonox/infos/GametypeInfo.h (modified) (2 diffs)
• src/orxonox/sound/WorldAmbientSound.cc (modified) (1 diff)

code/branches/HUD_HS16/src/orxonox/CMakeLists.txt

@@ -28 +28 @@
   LevelInfo.cc
   LevelManager.cc
-  Highscore.cc
   Main.cc
   MoodManager.cc
@@ -62 +61 @@
     LevelInfo.h
     LevelManager.h
-    Highscore.h
     MoodManager.h
     controllers/HumanController.h

code/branches/HUD_HS16/src/orxonox/LevelInfo.cc

@@ -151 +151 @@
     }
 
-    bool LevelInfoItem::addHighscore(const std::string& name, const int score)
-    {
-        std::stringstream stream;
-        stream << name << "/:/" << score;
-        bool success = this->highscores_.insert(stream.str()).second;
-        if(success)
-            this->highscoresUpdated();
-        return success;
-    }
-
     /**
     @brief
@@ -201 +191 @@
     }
 
-    void LevelInfoItem::highscoresUpdated(void)
-    {
-        std::stringstream stream;
-        std::set<std::string>::iterator temp;
-        for(std::set<std::string>::iterator it = this->highscores_.begin(); it != this->highscores_.end(); )
-        {
-            temp = it;
-            if(++it == this->highscores_.end()) // If this is the last tag we don't add a comma.
-                stream << *temp;
-            else
-                stream << *temp << ", ";
-        }
-
-        this->highscoresString_ = std::string(stream.str());
-    }
     /**
     @brief

code/branches/HUD_HS16/src/orxonox/LevelInfo.h

@@ -118 +118 @@
             inline bool hasTag(const std::string& tag) const { return this->tags_.find(tag) != this->tags_.end(); } // tolua_export
 
-            bool addHighscore(const std::string& name,const int score);
-
-            inline const std::string& getHighscores(void) const { return this->highscoresString_; } // tolua_export
-
             void setStartingShips(const std::string& ships); //!< Set the starting ship models of the level
             bool addStartingShip(const std::string& ship, bool update = true); //!< Add a model to shipselection
@@ -158 +154 @@
             void startingshipsUpdated(void); //!< Updates the comma-seperated string of all possible starting ships.
             void tagsUpdated(void); //!< Updates the comma-seperated string of all tags, if the set of tags has changed.
-            void highscoresUpdated(void);
             static void initializeTags(void); //!< Initialize the set of allowed tags.
             /**
@@ -175 +170 @@
             std::string screenshot_; //!< The screenshot of the Level.
             std::set<std::string> tags_; //!< The set of tags the Level is tagged with.
-
-            std::set<std::string> highscores_; 
-            std::string highscoresString_;
-
             std::string tagsString_; //!< The comma-seperated string of all the tags the Level is tagged with.
             std::set<std::string> startingShips_; //!< The set of starting ship models the Level allows.
@@ -253 +244 @@
             inline const std::string& getTags(void) const
                 { return this->LevelInfoItem::getTags(); }
-
-            inline const std::string& getHighscores(void) const
-                { return this->LevelInfoItem::getHighscores(); }
             /**
             @brief Set the starting ship models of the level

code/branches/HUD_HS16/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/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc

@@ -50 +50 @@
 #include "PlayerManager.h"
 #include "GSRoot.h"
+// #include "overlays/hud/HUDPickupSystem.h"
 
 namespace orxonox
@@ -126 +127 @@
             InputManager::getInstance().leaveState("game");
 
+        // HUDPickupSystem* pickupSystem;
+
+        // for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
+        //     pickupSystem = hud;
+
+        // pickupSystem->repaint=false;
+
         // disconnect all HumanPlayers
         PlayerManager::getInstance().disconnectAllClients();

code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+// #include "overlays/OverlaysPrereqs.h"
 
 #include <string>

code/branches/HUD_HS16/src/orxonox/gametypes/CMakeLists.txt

@@ -11 +11 @@
   TeamGametype.cc
   Mission.cc
-  StoryMode.cc
 )

code/branches/HUD_HS16/src/orxonox/gametypes/Gametype.cc

@@ -96 +96 @@
         }
     }
-    
+
     /**
      * @brief Initializes sub-objects of the Gametype. This must be called after the constructor.

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

@@ -68 +68 @@
         static const std::string names[] =
         {
-            "Berkay Berabi",
-            "Louis  Meile"
-            "Muten Roshi",
-            "Abradolf Lincler",
-            "Lionel Messi",
+            "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",
-            "Karl the Llama",
-            "Thomas the Tankengine",
-            "Rick",
-            "Morty",
-            "Charlie the Unicorn",
-            "Kung Fury",
-            "Postman Pat"
+            "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"
         };
         static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));

code/branches/HUD_HS16/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.

code/branches/HUD_HS16/src/orxonox/sound/WorldAmbientSound.cc

@@ -58 +58 @@
         soundList_.emplace_back("Ganymede.ogg");
         soundList_.emplace_back("luke_grey_-_hypermode.ogg");
-        soundList_.emplace_back("racetheme.ogg");
-
 
     }