Changeset 8039 for code/branches/usability

Timestamp:

Mar 7, 2011, 12:08:27 AM (13 years ago)

Author:

dafrick

Message:

Adding warning for levels with same names.

Location:

code/branches/usability

Files:

• data/levels/presentationFS102.oxw (modified) (1 diff)
• data/levels/presentationFS10Ed.oxw (modified) (1 diff)
• src/orxonox/LevelManager.cc (modified) (2 diffs)

code/branches/usability/data/levels/presentationFS102.oxw

@@ -1 +1 @@
 <LevelInfo
- name = "Presentation XI FPS"
+ name = "Presentation XI FPS 1st"
  description = "2nd Presentation level for Orxonox Convention XI, FPS"
  tags = "presentation"

code/branches/usability/data/levels/presentationFS10Ed.oxw

@@ -1 +1 @@
 <LevelInfo
- name = "Presentation XI FPS"
+ name = "Presentation XI FPS 2nd"
  description = "3rd Presentation level for Orxonox Convention XI, FPS"
  tags = "presentation"

code/branches/usability/src/orxonox/LevelManager.cc

@@ -251 +251 @@
         // Iterate over all the found *.oxw files
         COUT(3) << "Loading LevelInfos..." << std::endl;
+        std::set<std::string> names;
         for (Ogre::StringVector::const_iterator it = levels->begin(); it != levels->end(); ++it)
         {
@@ -277 +278 @@
                 }
 
+                // Warn about levels with the same name.
+                if(!names.insert(info->getName()).second)
+                    COUT(2) << "Warning: Multiple levels (" << info->getXMLFilename() << ") with name '" << info->getName() << "' found!" << std::endl;
+
                 // Warn about multiple items so that it gets fixed quickly
                 if(availableLevels_.find(info) != availableLevels_.end())
                 {
-                    COUT(2) << "Warning: Multiple levels with name '" << info->getName() << "' found!" << std::endl;
+                    COUT(2) << "Warning: Multiple levels (" << info->getXMLFilename() << ") with same name '" << info->getName() << "' and filename found! Exluding..." << std::endl;
                     // Delete LevelInfoItem to avoid a dangling pointer
                     delete info;