Changeset 6735

Timestamp:

Apr 16, 2010, 12:06:45 PM (15 years ago)

Author:

rgrieder

Message:

Removed getInstancePtr() from all Singletons.
Use "exists()" (check) and "&getInstance()" (pointer) instead.

Location:

code/branches/gamestates2/src/orxonox

Files:

• CameraManager.h (modified) (1 diff)
• Level.cc (modified) (2 diffs)
• LevelManager.h (modified) (1 diff)
• PlayerManager.cc (modified) (2 diffs)

code/branches/gamestates2/src/orxonox/CameraManager.h

@@ -61 +61 @@
             void useCamera(Ogre::Camera* camera);
 
-            static CameraManager* getInstancePtr() { return singletonPtr_s; }
-
         private:
             CameraManager(const CameraManager&); // don't use

code/branches/gamestates2/src/orxonox/Level.cc

@@ -58 +58 @@
         if (this->isInitialized())
         {
-            if (LevelManager::getInstancePtr())
+            if (LevelManager::exists())
                 LevelManager::getInstance().releaseActivity(this);
 
@@ -116 +116 @@
             (*it)->setGametype(rootgametype);
 
-        if (LevelManager::getInstancePtr())
+        if (LevelManager::exists())
             LevelManager::getInstance().requestActivity(this);
     }

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

@@ -62 +62 @@
             const std::string& getAvailableLevelListItem(unsigned int index) const; //tolua_export
 
-            static LevelManager* getInstancePtr() { return singletonPtr_s; }
             static LevelManager& getInstance()    { return Singleton<LevelManager>::getInstance(); } // tolua_export
 

code/branches/gamestates2/src/orxonox/PlayerManager.cc

@@ -66 +66 @@
             this->clients_[clientID] = player;
 
-            if (LevelManager::getInstancePtr() && LevelManager::getInstance().getActiveLevel())
+            if (LevelManager::exists() && LevelManager::getInstance().getActiveLevel())
                 LevelManager::getInstance().getActiveLevel()->playerEntered(player);
         }
@@ -82 +82 @@
             this->clients_.erase(clientID);
 
-            if (LevelManager::getInstancePtr() && LevelManager::getInstance().getActiveLevel())
+            if (LevelManager::exists() && LevelManager::getInstance().getActiveLevel())
                 LevelManager::getInstance().getActiveLevel()->playerLeft(player);