Changeset 5850 for code/branches/core5/src/orxonox/PlayerManager.h

Timestamp:

Oct 1, 2009, 11:44:53 AM (15 years ago)

Author:

rgrieder

Message:

Moved the singleton creation/destruction mess to the Core class by using just two possible Scopes:

• ScopeID::Root for singletons that may always persists
• ScopeID::Graphics for singletons that only work when graphics was loaded

File:

• code/branches/core5/src/orxonox/PlayerManager.h (modified) (1 diff)

code/branches/core5/src/orxonox/PlayerManager.h

@@ -34 +34 @@
 #include <cassert>
 #include <map>
-#include "util/Singleton.h"
+#include "util/ScopedSingleton.h"
 #include "network/ClientConnectionListener.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PlayerManager : public Singleton<PlayerManager>, public ClientConnectionListener
+    class _OrxonoxExport PlayerManager : public ScopedSingleton<PlayerManager, ScopeID::Root>, public ClientConnectionListener
     {
-            friend class Singleton<PlayerManager>;
+            friend class ScopedSingleton<PlayerManager, ScopeID::Root>;
         public:
             PlayerManager();