Changeset 8051 for code/branches/tutorial/src/orxonox/LevelInfo.h

Timestamp:

Mar 9, 2011, 11:27:05 AM (13 years ago)

Author:

dafrick

Message:

Merging latest changes in usability branch into tutorial branch.

Location:

code/branches/tutorial

Files:

• . (modified) (1 prop)
• src/orxonox/LevelInfo.h (modified) (2 diffs)

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

@@ -109 +109 @@
             @return Returns the XML-filename (including *.oxw extension) of the Level.
             */
-            inline const std::string& getXMLFilename(void) { return this->xmlfilename_; } // tolua_export
+            inline const std::string& getXMLFilename(void) const { return this->xmlfilename_; } // tolua_export
 
         protected:
@@ -212 +212 @@
     {
         bool operator() (const LevelInfoItem* lhs, const LevelInfoItem* rhs) const
-            { return getLowercase(lhs->getName()).compare(getLowercase(rhs->getName())) < 0; }
+            {
+                if(getLowercase(lhs->getName()).compare(getLowercase(rhs->getName())) == 0)
+                    return getLowercase(lhs->getXMLFilename()).compare(getLowercase(rhs->getXMLFilename())) < 0;
+                return getLowercase(lhs->getName()).compare(getLowercase(rhs->getName())) < 0;
+            }
     };