Changeset 11716

Timestamp:

Jan 7, 2018, 9:48:58 PM (6 years ago)

Author:

landauf

Message:

[Highscore_HS16] moved logic to compare old an new score to Highscore; fixed formatting in Gametypes

Location:

code/trunk/src

Files:

• modules/dodgerace/DodgeRace.cc (modified) (1 diff)
• modules/invader/Invader.cc (modified) (1 diff)
• modules/jump/Jump.cc (modified) (1 diff)
• modules/tetris/Tetris.cc (modified) (1 diff)
• modules/towerdefense/TowerDefense.cc (modified) (1 diff)
• orxonox/Highscore.cc (modified) (1 diff)
• orxonox/Highscore.h (modified) (1 diff)

code/trunk/src/modules/dodgerace/DodgeRace.cc

@@ -225 +225 @@
         // It will misteriously crash the game!
         // Instead startMainMenu, this won't crash.
-        if (Highscore::exists()){
-                    int score = this->getPoints();
-                    if(score > Highscore::getInstance().getHighestScoreOfGame("Dodge Race")) 
-                        Highscore::getInstance().storeHighscore("Dodge Race",score,this->getPlayer()->getPlayer());
-
-          }
+        if (Highscore::exists())
+        {
+            int score = this->getPoints();
+            Highscore::getInstance().storeScore("Dodge Race", score, this->getPlayer()->getPlayer());
+        }
         GSLevel::startMainMenu();
     }

code/trunk/src/modules/invader/Invader.cc

@@ -189 +189 @@
         // It will misteriously crash the game!
         // Instead startMainMenu, this won't crash.
-        if (Highscore::exists()){
-                    int score = this->getPoints();
-                    if(score > Highscore::getInstance().getHighestScoreOfGame("Orxonox Arcade")) 
-                        Highscore::getInstance().storeHighscore("Orxonox Arcade",score,this->getPlayer()->getPlayer());
-
-          }
+        if (Highscore::exists())
+        {
+            int score = this->getPoints();
+            Highscore::getInstance().storeScore("Orxonox Arcade", score, this->getPlayer()->getPlayer());
+        }
         GSLevel::startMainMenu();
     }

code/trunk/src/modules/jump/Jump.cc

@@ -312 +312 @@
         cleanup();
         GSLevel::startMainMenu();
-        if (Highscore::exists()){
-                    int score = this->getScore(this->getPlayer());
-                    if(score > Highscore::getInstance().getHighestScoreOfGame("Jump")) 
-                        Highscore::getInstance().storeHighscore("Jump",score,this->getPlayer());
-
-          }
+        if (Highscore::exists())
+        {
+            int score = this->getScore(this->getPlayer());
+            Highscore::getInstance().storeScore("Jump", score, this->getPlayer());
+        }
         Deathmatch::end();
     }

code/trunk/src/modules/tetris/Tetris.cc

@@ -328 +328 @@
             this->player_->stopControl();
         }
-         if (Highscore::exists()){
-                    int score = this->getScore(this->getPlayer());
-                    if(score > Highscore::getInstance().getHighestScoreOfGame("Tetris")) 
-                        Highscore::getInstance().storeHighscore("Tetris",score,this->getPlayer());
-
-          }
+        if (Highscore::exists())
+        {
+            int score = this->getScore(this->getPlayer());
+            Highscore::getInstance().storeScore("Tetris", score, this->getPlayer());
+        }
         this->cleanup();
 

code/trunk/src/modules/towerdefense/TowerDefense.cc

@@ -198 +198 @@
     void TowerDefense::end()
     {
-        if (Highscore::exists()){
-                    int score = this->getWaveNumber();
-                    if(score > Highscore::getInstance().getHighestScoreOfGame("Tower Defense")) 
-                        Highscore::getInstance().storeHighscore("Tower Defense",score,this->getPlayer());
-
-          }
+        if (Highscore::exists())
+        {
+            int score = this->getWaveNumber();
+            Highscore::getInstance().storeScore("Tower Defense", score, this->getPlayer());
+        }
         TeamDeathmatch::end();
         ChatManager::message("Match is over! Gameover!");

code/trunk/src/orxonox/Highscore.cc

@@ -50 +50 @@
 
     /**
-     * @brief stores a new highscore in the orxonox.ini file
+     * @brief stores a new highscore in the orxonox.ini file if the new score is better than the highest score so far.
      */
-    void Highscore::storeHighscore(const std::string& level, int points, PlayerInfo* player){
-        ModifyConfigValue(highscores_, add, player->getName() + "./." + level + "./." + multi_cast<std::string>(points));
+    void 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));
+        }
     }
 }

code/trunk/src/orxonox/Highscore.h

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