Changeset 7626 for code/branches/releasetodo/src/orxonox

Timestamp:

Nov 6, 2010, 9:52:48 PM (14 years ago)

Author:

dafrick

Message:

Accidentally removed a file. Re-adding it.
Levels that are tagged with "test" are now not displayed by default, but can be displayed by choosing show all.

Location:

code/branches/releasetodo/src/orxonox

Files:

• LevelInfo.cc (added)
• LevelInfo.h (modified) (8 diffs)
• LevelManager.cc (modified) (2 diffs)
• LevelManager.h (modified) (1 diff)

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

@@ -44 +44 @@
 #include "core/OrxonoxClass.h"
 
-namespace orxonox
-{
+namespace orxonox // tolua_export
+{ // tolua_export
 
     /**
@@ -55 +55 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport LevelInfoItem : virtual public OrxonoxClass
-    {
+    class _OrxonoxExport LevelInfoItem // tolua_export
+        : virtual public OrxonoxClass
+    { // tolua_export
         public:
             LevelInfoItem(); //!< Default constructor.
@@ -72 +73 @@
             @return Returns the name of the Level.
             */
-            inline const std::string& getName(void)
-                { return this->name_; }
+            inline const std::string& getName(void) { return this->name_; } // tolua_export
 
             /**
@@ -85 +85 @@
             @return Returns the description of the Level.
             */
-            inline const std::string& getDescription() const
-                { return this->description_; }
+            inline const std::string& getDescription() const { return this->description_; } // tolua_export
 
             void setTags(const std::string& tags); //!< Set the tags the Level is tagged with.
@@ -101 +100 @@
             @return Returns true if the Level is tagged with the input tag.
             */
-            bool hasTag(const std::string& tag) const
-                { return this->tags_.find(tag) != this->tags_.end(); }
+            inline bool hasTag(const std::string& tag) const { return this->tags_.find(tag) != this->tags_.end(); } // tolua_export
 
             /**
@@ -108 +106 @@
             @return Returns the XML-filename (including *.oxw extension) of the Level.
             */
-            inline const std::string& getXMLFilename(void)
-                { return this->xmlfilename_; }
+            inline const std::string& getXMLFilename(void) { return this->xmlfilename_; } // tolua_export
 
         protected:
@@ -128 +125 @@
             std::set<std::string> tags_; //!< The set of tags the Level is tagged with.
             std::string tagsString_; //!< The comma-seperated string of all the tags the Level is tagged with.
-    };
+    }; // tolua_export
 
     /**
@@ -188 +185 @@
 
     };
-}
+} // tolua_export
 
 #endif /* _LevelInfo_H__ */

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

@@ -134 +134 @@
         this->updateAvailableLevelList();
 
-        COUT(0) << "Number of Levels: " << this->infos_.size() << std::endl;
-
         return this->availableLevels_.size();
     }
 
-    const std::string& LevelManager::getAvailableLevelListItem(unsigned int index) const
+    LevelInfoItem* LevelManager::getAvailableLevelListItem(unsigned int index) const
     {
         if (index >= this->availableLevels_.size())
-            return BLANKSTRING;
+            return NULL;
         else
         {
             std::map<std::string, LevelInfoItem*>::const_iterator it = this->infos_.find(this->availableLevels_[index]);
-            assert(it->second);
-            return it->second->getName();
+            return it->second;
         }
     }
@@ -172 +169 @@
                 {
                     LevelInfoItem* info = item->copy();
-                    COUT(0) << "BUUUUUUUUUH: " << info->getName() << " | " << info->getXMLFilename() << " | " << it->substr(0, pos) << std::endl;
                     if(info->getXMLFilename() == *it)
                     {

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

@@ -61 +61 @@
             const std::string& getDefaultLevel() const; //tolua_export
             unsigned int getNumberOfLevels(void); //tolua_export
-            const std::string& getAvailableLevelListItem(unsigned int index) const; //tolua_export
+            LevelInfoItem* getAvailableLevelListItem(unsigned int index) const; //tolua_export
 
             static LevelManager& getInstance()    { return Singleton<LevelManager>::getInstance(); } // tolua_export