Changeset 6417 for code/trunk/src/modules/questsystem/notifications/NotificationManager.cc

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/questsystem/notifications/NotificationManager.cc (modified) (1 diff)

code/trunk/src/modules/questsystem/notifications/NotificationManager.cc

@@ -44 +44 @@
 {
 
-    const std::string NotificationManager::ALL = "all";
-    const std::string NotificationManager::NONE = "none";
+    const std::string NotificationManager::ALL("all");
+    const std::string NotificationManager::NONE("none");
 
-    NotificationManager* NotificationManager::singletonPtr_s = NULL;
     ManageScopedSingleton(NotificationManager, ScopeID::Root, false);