Changeset 6373 for code/branches/presentation2/src/libraries

Timestamp:

Dec 17, 2009, 11:27:00 PM (15 years ago)

Author:

rgrieder

Message:

Added config value to disable sound entirely.
Also added InitialisationAbortedException to be used by singletons in order not to be constructed, but nicely telling the user (only for those singletons who are allowed to fail!).

Location:

code/branches/presentation2/src/libraries

Files:

• core/ScopedSingletonManager.h (modified) (1 diff)
• util/Exception.h (modified) (1 diff)

code/branches/presentation2/src/libraries/core/ScopedSingletonManager.h

@@ -162 +162 @@
             try
                 { singletonPtr_ = new T(); }
+            catch (const InitialisationAbortedException& ex)
+                { COUT(3) << ex.getDescription() << std::endl; }
             catch (...)
                 { COUT(1) << "Singleton creation failed: " << Exception::handleMessage() << std::endl; }

code/branches/presentation2/src/libraries/util/Exception.h

@@ -131 +131 @@
     CREATE_ORXONOX_EXCEPTION(PluginsNotFound);
     CREATE_ORXONOX_EXCEPTION(InitialisationFailed);
+    CREATE_ORXONOX_EXCEPTION(InitialisationAborted);
     CREATE_ORXONOX_EXCEPTION(NotImplemented);
     CREATE_ORXONOX_EXCEPTION(GameState);