Changeset 6735 for code/branches/gamestates2/src/orxonox
- Timestamp:
- Apr 16, 2010, 12:06:45 PM (15 years ago)
- Location:
- code/branches/gamestates2/src/orxonox
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gamestates2/src/orxonox/CameraManager.h
r5929 r6735 61 61 void useCamera(Ogre::Camera* camera); 62 62 63 static CameraManager* getInstancePtr() { return singletonPtr_s; }64 65 63 private: 66 64 CameraManager(const CameraManager&); // don't use -
code/branches/gamestates2/src/orxonox/Level.cc
r6417 r6735 58 58 if (this->isInitialized()) 59 59 { 60 if (LevelManager:: getInstancePtr())60 if (LevelManager::exists()) 61 61 LevelManager::getInstance().releaseActivity(this); 62 62 … … 116 116 (*it)->setGametype(rootgametype); 117 117 118 if (LevelManager:: getInstancePtr())118 if (LevelManager::exists()) 119 119 LevelManager::getInstance().requestActivity(this); 120 120 } -
code/branches/gamestates2/src/orxonox/LevelManager.h
r6417 r6735 62 62 const std::string& getAvailableLevelListItem(unsigned int index) const; //tolua_export 63 63 64 static LevelManager* getInstancePtr() { return singletonPtr_s; }65 64 static LevelManager& getInstance() { return Singleton<LevelManager>::getInstance(); } // tolua_export 66 65 -
code/branches/gamestates2/src/orxonox/PlayerManager.cc
r6417 r6735 66 66 this->clients_[clientID] = player; 67 67 68 if (LevelManager:: getInstancePtr() && LevelManager::getInstance().getActiveLevel())68 if (LevelManager::exists() && LevelManager::getInstance().getActiveLevel()) 69 69 LevelManager::getInstance().getActiveLevel()->playerEntered(player); 70 70 } … … 82 82 this->clients_.erase(clientID); 83 83 84 if (LevelManager:: getInstancePtr() && LevelManager::getInstance().getActiveLevel())84 if (LevelManager::exists() && LevelManager::getInstance().getActiveLevel()) 85 85 LevelManager::getInstance().getActiveLevel()->playerLeft(player); 86 86
Note: See TracChangeset
for help on using the changeset viewer.