Changeset 6373 for code/branches
- Timestamp:
- Dec 17, 2009, 11:27:00 PM (15 years ago)
- Location:
- code/branches/presentation2/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/libraries/core/ScopedSingletonManager.h
r6183 r6373 162 162 try 163 163 { singletonPtr_ = new T(); } 164 catch (const InitialisationAbortedException& ex) 165 { COUT(3) << ex.getDescription() << std::endl; } 164 166 catch (...) 165 167 { COUT(1) << "Singleton creation failed: " << Exception::handleMessage() << std::endl; } -
code/branches/presentation2/src/libraries/util/Exception.h
r5747 r6373 131 131 CREATE_ORXONOX_EXCEPTION(PluginsNotFound); 132 132 CREATE_ORXONOX_EXCEPTION(InitialisationFailed); 133 CREATE_ORXONOX_EXCEPTION(InitialisationAborted); 133 134 CREATE_ORXONOX_EXCEPTION(NotImplemented); 134 135 CREATE_ORXONOX_EXCEPTION(GameState); -
code/branches/presentation2/src/orxonox/sound/SoundManager.cc
r6370 r6373 69 69 { 70 70 RegisterRootObject(SoundManager); 71 72 // See whether we even want to load 73 bool bDisableSound_ = false; 74 SetConfigValue(bDisableSound_, false); 75 if (bDisableSound_) 76 ThrowException(InitialisationAborted, "Sound: Not loading at all"); 71 77 72 78 if (!alutInitWithoutContext(NULL, NULL))
Note: See TracChangeset
for help on using the changeset viewer.