Changeset 11768

Timestamp:

Feb 18, 2018, 4:27:43 PM (6 years ago)

Author:

landauf

Message:

[SOBv2_HS17] fixed build (Highscopre API has changed)

Location:

code/branches/Presentation_HS17_merge/src

Files:

• modules/superorxobros/SOBFigure.cc (modified) (1 diff)
• orxonox/Highscore.cc (modified) (1 diff)
• orxonox/Highscore.h (modified) (1 diff)

code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc

@@ -385 +385 @@
         if (reachedLvlEndState_ == 4) {
             //Highscore
-            if (Highscore::exists()){
-                    int score = SOBGame->getPoints();
-                    if(score > Highscore::getInstance().getHighestScoreOfGame("Super Orxo Bros.")) 
-                        Highscore::getInstance().storeHighscore("Super Orxo Bros.",score);
-                        SOBGame->newHighscore=1;
-
+            if (Highscore::exists())
+            {
+                int score = SOBGame->getPoints();
+                bool isHighScore = Highscore::getInstance().storeScore("Super Orxo Bros.", score, this->getPlayer());
+                SOBGame->newHighscore = isHighScore;
             }
             lvlEnded_ = true;

code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc

@@ -82 +82 @@
     /**
      * @brief stores a new highscore in the orxonox.ini file if the new score is better than the highest score so far.
+     * @returns true if the given score marks a new high score
      */
-    void Highscore::storeScore(const std::string& level, int points, PlayerInfo* player)
+    bool Highscore::storeScore(const std::string& level, int points, PlayerInfo* player)
     {
         if (points > this->getHighestScoreOfGame(level))
         {
             ModifyConfigValue(highscores_, add, player->getName() + "./." + level + "./." + multi_cast<std::string>(points));
+            return true;
         }
+        else
+            return false;
     }
 }

code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h

@@ -49 +49 @@
             void setConfigValues(); // Inherited function
 
-            void storeScore(const std::string& level, int points, PlayerInfo* player);
+            bool storeScore(const std::string& level, int points, PlayerInfo* player);
             int getHighestScoreOfGame(const std::string& game);