Changeset 11714 for code

Timestamp:

Jan 7, 2018, 8:03:19 PM (7 years ago)

Author:

landauf

Message:

[Highscore_HS16] reverted changes in LevelInfo - they don't seem to be needed (everything is done by the Highscore class)

Location:

code/trunk/src/orxonox

Files:

• LevelInfo.cc (modified) (2 diffs)
• LevelInfo.h (modified) (4 diffs)

code/trunk/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/trunk/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