Changeset 3280 for code/trunk/src/orxonox/LevelManager.h
- Timestamp:
- Jul 12, 2009, 11:58:01 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 (added) merged: 3235-3237,3245-3250,3253-3254,3260-3261,3265,3270
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/LevelManager.h
r3196 r3280 34 34 #include <cassert> 35 35 #include <list> 36 #include "core/OrxonoxClass.h" 36 37 38 // tolua_begin 37 39 namespace orxonox 38 40 { 39 41 class _OrxonoxExport LevelManager 40 { 42 // tolua_end 43 : public OrxonoxClass 44 { // tolua_export 41 45 public: 42 46 LevelManager(); 43 47 virtual ~LevelManager(); 48 49 void setConfigValues(); 44 50 45 51 void requestActivity(Level* level); … … 47 53 Level* getActiveLevel(); 48 54 55 void setDefaultLevel(const std::string& levelName); //tolua_export 56 const std::string& getDefaultLevel(); //tolua_export 57 49 58 static LevelManager* getInstancePtr() { return singletonRef_s; } 50 static LevelManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; } 59 static LevelManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; } // tolua_export 51 60 52 61 private: … … 57 66 std::list<Level*> levels_s; 58 67 68 // config values 69 std::string defaultLevelName_; 70 59 71 static LevelManager* singletonRef_s; 60 }; 61 } 72 }; // tolua_export 73 } // tolua_export 62 74 63 75 #endif /* _LevelManager_H__ */
Note: See TracChangeset
for help on using the changeset viewer.