Changeset 7638

Timestamp:

Nov 11, 2010, 11:21:28 AM (14 years ago)

Author:

dafrick

Message:

Adding restriction to possible tags.

Location:

code/branches/releasetodo/src/orxonox

Files:

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

code/branches/releasetodo/src/orxonox/LevelInfo.cc

@@ -42 +42 @@
 
     // LevelInfoItem
+    
+    //! The list of allowed tags.
+    /*static*/ std::set<std::string> LevelInfoItem::possibleTags_s = std::set<std::string>();
 
     /**
@@ -73 +76 @@
     {
 
+    }
+    
+    void LevelInfoItem::initializeTags(void)
+    {
+        if(!LevelInfoItem::initialized_s)
+        {
+            LevelInfoItem::possibleTags_s.insert("test");
+            LevelInfoItem::possibleTags_s.insert("singleplayer");
+            LevelInfoItem::possibleTags_s.insert("multiplayer");
+            LevelInfoItem::possibleTags_s.insert("showcase");
+            LevelInfoItem::possibleTags_s.insert("tutorial");
+        }
     }
 
@@ -103 +118 @@
     bool LevelInfoItem::addTag(const std::string& tag, bool update)
     {
+        if(!this->validateTag(tag))
+        {
+            COUT(2) << "Bad tag '" << tag << "' in " << this->getXMLFilename() << ". Ignoring..." << std::endl;
+            return false;
+        }
         bool success = this->tags_.insert(std::string(tag)).second;
         if(update && success)

code/branches/releasetodo/src/orxonox/LevelInfo.h

@@ -38 +38 @@
 #include "OrxonoxPrereqs.h"
 
+#include <map>
 #include <set>
 #include <string>
@@ -120 +121 @@
         private:
             void tagsUpdated(void); //!< Updates the comma-seperated string of all tags, if the set of tags has changed.
+            
+            static std::set<std::string> possibleTags_s;
+            static const bool initialized_s = false;
+            void initializeTags(void);
+            bool validateTag(const std::string& tag)
+                { this->initializeTags(); return LevelInfoItem::possibleTags_s.find(tag) != LevelInfoItem::possibleTags_s.end(); }
 
             std::string name_; //!< The name of the Level.