Changeset 11333 for code/branches/Highscore_HS16/src

Timestamp:

Dec 12, 2016, 3:28:37 PM (7 years ago)

Author:

kappenh

Message:

Finished Project

Location:

code/branches/Highscore_HS16/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/CMakeLists.txt (modified) (1 diff)
• orxonox/Highscore.cc (modified) (2 diffs)
• orxonox/Highscore.h (modified) (2 diffs)
• orxonox/highscore (deleted)

code/branches/Highscore_HS16/src/modules/dodgerace/DodgeRace.cc

@@ -228 +228 @@
                     int score = this->getPoints();
                     if(score > Highscore::getInstance().getHighestScoreOfGame("Dodge Race")) 
-                        Highscore::getInstance().storeHighscore("Player","Dodge Race",score);
+                        Highscore::getInstance().storeHighscore("Dodge Race",score);
 
           }

code/branches/Highscore_HS16/src/modules/invader/Invader.cc

@@ -192 +192 @@
                     int score = this->getPoints();
                     if(score > Highscore::getInstance().getHighestScoreOfGame("Orxonox Arcade")) 
-                        Highscore::getInstance().storeHighscore("Player","Orxonox Arcade",score);
+                        Highscore::getInstance().storeHighscore("Orxonox Arcade",score);
 
           }

code/branches/Highscore_HS16/src/modules/jump/Jump.cc

@@ -315 +315 @@
                     int score = this->getScore(this->getPlayer());
                     if(score > Highscore::getInstance().getHighestScoreOfGame("Jump")) 
-                        Highscore::getInstance().storeHighscore("Player","Jump",score);
+                        Highscore::getInstance().storeHighscore("Jump",score);
 
           }

code/branches/Highscore_HS16/src/modules/tetris/Tetris.cc

@@ -331 +331 @@
                     int score = this->getScore(this->getPlayer());
                     if(score > Highscore::getInstance().getHighestScoreOfGame("Tetris")) 
-                        Highscore::getInstance().storeHighscore("Player","Tetris",score);
+                        Highscore::getInstance().storeHighscore("Tetris",score);
 
           }

code/branches/Highscore_HS16/src/modules/towerdefense/TowerDefense.cc

@@ -201 +201 @@
                     int score = this->getWaveNumber();
                     if(score > Highscore::getInstance().getHighestScoreOfGame("Tower Defense")) 
-                        Highscore::getInstance().storeHighscore("Player","Tower Defense",score);
+                        Highscore::getInstance().storeHighscore("Tower Defense",score);
 
           }

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

@@ -47 +47 @@
 ADD_SUBDIRECTORY(gametypes)
 ADD_SUBDIRECTORY(graphics)
-ADD_SUBDIRECTORY(highscore)
 ADD_SUBDIRECTORY(infos)
 ADD_SUBDIRECTORY(interfaces)

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

@@ -17 +17 @@
         this->setConfigValues();
     }
-
+    /**
+     * @brief set the config values in the orxonox.ini file
+     */
     void Highscore::setConfigValues()
     {
-        SetConfigValue(highscores_, std::vector<std::string>()).description("HighscoreVektor");
+        SetConfigValue(highscores_, std::vector<std::string>()).description("Highscores saved as vector");
+        SetConfigValue(playerName_, "Player").description("Name of the player");
     }
-
+    /**
+     * @brief Returns highest score of given game, if exists.
+     * Else returns -1.
+     */
     int Highscore::getHighestScoreOfGame(std::string game){
-        std::string delimiter = "./.";
+        std::string delimiter = "./."; //score save as "Playername./.game./.score"
         int best = -1;
+        //check for the highest Score of given game
         for (std::string score : this->highscores_)
         {
-            
+            //filter the game string from given highscore
             score.erase(0, score.find(delimiter) + delimiter.length());
             if(game.compare(score.substr(0,score.find(delimiter))) == 0){
@@ -42 +49 @@
         
     }
-
-    void Highscore::storeHighscore(std::string player, std::string level, int points){
-        ModifyConfigValue(highscores_, add, player+"./."+level+"./."+std::to_string(points));
+    /**
+     * @brief stores a new highscore in the orxonox.ini file
+     */
+    void Highscore::storeHighscore(std::string level, int points){
+        ModifyConfigValue(highscores_, add, playerName_+"./."+level+"./."+std::to_string(points));
     }
-    /* static std::string Highscore::getName(){
-        std::string result;
-        result = Highscore::name_;
-        return result;
-    }*/
+    
 }

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

@@ -14 +14 @@
         Highscore();              // Constructor
         void setConfigValues(); // Inherited function
-        void storeHighscore(std::string player, std::string level, int points);
+        void storeHighscore(std::string level, int points);
 
         int getHighestScoreOfGame(std::string game);
@@ -32 +32 @@
         std::vector<std::string> highscores_;
         float version_;
+        std::string playerName_;
         static Highscore* singletonPtr_s;
 }; //tolua_export