Changeset 11356 for code/trunk/src/orxonox
- Timestamp:
- Mar 9, 2017, 3:38:58 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 4 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/Highscore_HS16 (added) merged: 11226,11233,11235,11245,11254,11265,11267,11304,11313,11315,11324,11326,11333
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/CMakeLists.txt
r11353 r11356 28 28 LevelInfo.cc 29 29 LevelManager.cc 30 Highscore.cc 30 31 Main.cc 31 32 MoodManager.cc … … 61 62 LevelInfo.h 62 63 LevelManager.h 64 Highscore.h 63 65 MoodManager.h 64 66 controllers/HumanController.h -
code/trunk/src/orxonox/LevelInfo.cc
r11099 r11356 151 151 } 152 152 153 bool LevelInfoItem::addHighscore(const std::string& name, const int score) 154 { 155 std::stringstream stream; 156 stream << name << "/:/" << score; 157 bool success = this->highscores_.insert(stream.str()).second; 158 if(success) 159 this->highscoresUpdated(); 160 return success; 161 } 162 153 163 /** 154 164 @brief … … 191 201 } 192 202 203 void LevelInfoItem::highscoresUpdated(void) 204 { 205 std::stringstream stream; 206 std::set<std::string>::iterator temp; 207 for(std::set<std::string>::iterator it = this->highscores_.begin(); it != this->highscores_.end(); ) 208 { 209 temp = it; 210 if(++it == this->highscores_.end()) // If this is the last tag we don't add a comma. 211 stream << *temp; 212 else 213 stream << *temp << ", "; 214 } 215 216 this->highscoresString_ = std::string(stream.str()); 217 } 193 218 /** 194 219 @brief -
code/trunk/src/orxonox/LevelInfo.h
r11099 r11356 118 118 inline bool hasTag(const std::string& tag) const { return this->tags_.find(tag) != this->tags_.end(); } // tolua_export 119 119 120 bool addHighscore(const std::string& name,const int score); 121 122 inline const std::string& getHighscores(void) const { return this->highscoresString_; } // tolua_export 123 120 124 void setStartingShips(const std::string& ships); //!< Set the starting ship models of the level 121 125 bool addStartingShip(const std::string& ship, bool update = true); //!< Add a model to shipselection … … 154 158 void startingshipsUpdated(void); //!< Updates the comma-seperated string of all possible starting ships. 155 159 void tagsUpdated(void); //!< Updates the comma-seperated string of all tags, if the set of tags has changed. 160 void highscoresUpdated(void); 156 161 static void initializeTags(void); //!< Initialize the set of allowed tags. 157 162 /** … … 170 175 std::string screenshot_; //!< The screenshot of the Level. 171 176 std::set<std::string> tags_; //!< The set of tags the Level is tagged with. 177 178 std::set<std::string> highscores_; 179 std::string highscoresString_; 180 172 181 std::string tagsString_; //!< The comma-seperated string of all the tags the Level is tagged with. 173 182 std::set<std::string> startingShips_; //!< The set of starting ship models the Level allows. … … 244 253 inline const std::string& getTags(void) const 245 254 { return this->LevelInfoItem::getTags(); } 255 256 inline const std::string& getHighscores(void) const 257 { return this->LevelInfoItem::getHighscores(); } 246 258 /** 247 259 @brief Set the starting ship models of the level
Note: See TracChangeset
for help on using the changeset viewer.