Changeset 6735 for code/branches/gamestates2/src/orxonox/PlayerManager.cc

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.

File:

• code/branches/gamestates2/src/orxonox/PlayerManager.cc (modified) (2 diffs)

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);