[Orxonox-commit 2018] r6735 - code/branches/gamestates2/src/orxonox

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-04-16 12:06:45 +0200 (Fri, 16 Apr 2010)
New Revision: 6735

Modified:
   code/branches/gamestates2/src/orxonox/CameraManager.h
   code/branches/gamestates2/src/orxonox/Level.cc
   code/branches/gamestates2/src/orxonox/LevelManager.h
   code/branches/gamestates2/src/orxonox/PlayerManager.cc
Log:
Removed getInstancePtr() from all Singletons.
Use "exists()" (check) and "&getInstance()" (pointer) instead.

Modified: code/branches/gamestates2/src/orxonox/CameraManager.h
===================================================================
--- code/branches/gamestates2/src/orxonox/CameraManager.h	2010-04-15 14:06:27 UTC (rev 6734)
+++ code/branches/gamestates2/src/orxonox/CameraManager.h	2010-04-16 10:06:45 UTC (rev 6735)
@@ -60,8 +60,6 @@
 
             void useCamera(Ogre::Camera* camera);
 
-            static CameraManager* getInstancePtr() { return singletonPtr_s; }
-
         private:
             CameraManager(const CameraManager&); // don't use
 

Modified: code/branches/gamestates2/src/orxonox/Level.cc
===================================================================
--- code/branches/gamestates2/src/orxonox/Level.cc	2010-04-15 14:06:27 UTC (rev 6734)
+++ code/branches/gamestates2/src/orxonox/Level.cc	2010-04-16 10:06:45 UTC (rev 6735)
@@ -57,7 +57,7 @@
     {
         if (this->isInitialized())
         {
-            if (LevelManager::getInstancePtr())
+            if (LevelManager::exists())
                 LevelManager::getInstance().releaseActivity(this);
 
             if (this->xmlfile_)
@@ -115,7 +115,7 @@
         for (std::list<BaseObject*>::iterator it = this->objects_.begin(); it != this->objects_.end(); ++it)
             (*it)->setGametype(rootgametype);
 
-        if (LevelManager::getInstancePtr())
+        if (LevelManager::exists())
             LevelManager::getInstance().requestActivity(this);
     }
 

Modified: code/branches/gamestates2/src/orxonox/LevelManager.h
===================================================================
--- code/branches/gamestates2/src/orxonox/LevelManager.h	2010-04-15 14:06:27 UTC (rev 6734)
+++ code/branches/gamestates2/src/orxonox/LevelManager.h	2010-04-16 10:06:45 UTC (rev 6735)
@@ -61,7 +61,6 @@
             void compileAvailableLevelList(); //tolua_export
             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
 
         private:

Modified: code/branches/gamestates2/src/orxonox/PlayerManager.cc
===================================================================
--- code/branches/gamestates2/src/orxonox/PlayerManager.cc	2010-04-15 14:06:27 UTC (rev 6734)
+++ code/branches/gamestates2/src/orxonox/PlayerManager.cc	2010-04-16 10:06:45 UTC (rev 6735)
@@ -65,7 +65,7 @@
             assert(!this->clients_[clientID]);
             this->clients_[clientID] = player;
 
-            if (LevelManager::getInstancePtr() && LevelManager::getInstance().getActiveLevel())
+            if (LevelManager::exists() && LevelManager::getInstance().getActiveLevel())
                 LevelManager::getInstance().getActiveLevel()->playerEntered(player);
         }
     }
@@ -81,7 +81,7 @@
             PlayerInfo* player = this->clients_[clientID];
             this->clients_.erase(clientID);
 
-            if (LevelManager::getInstancePtr() && LevelManager::getInstance().getActiveLevel())
+            if (LevelManager::exists() && LevelManager::getInstance().getActiveLevel())
                 LevelManager::getInstance().getActiveLevel()->playerLeft(player);
 
             // delete PlayerInfo instance