Changeset 1756
- Timestamp:
- Sep 10, 2008, 2:11:01 AM (16 years ago)
- Location:
- code/trunk/src/core
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/core/Core.cc
r1755 r1756 33 33 34 34 #include "Core.h" 35 #include <cassert> 35 36 #include "Language.h" 36 37 #include "CoreIncludes.h" … … 80 81 Core& Core::getInstance() 81 82 { 82 static Core instance = Core();83 static Core instance; 83 84 84 85 // If bCreatingSoftDebugLevelObject is true, we're just about to create an instance of the DebugLevel class 85 if (Core::isCreatingCoreSettings())86 {87 isCreatingCoreSettings() = false;88 instance.setConfigValues();89 }86 //if (Core::isCreatingCoreSettings()) 87 //{ 88 // isCreatingCoreSettings() = false; 89 // instance.setConfigValues(); 90 //} 90 91 return instance; 91 92 } … … 138 139 if (!Core::isCreatingCoreSettings()) 139 140 { 140 if (device == OutputHandler::LD_All) 141 switch (device) 142 { 143 case OutputHandler::LD_All: 141 144 return Core::getInstance().softDebugLevel_; 142 else if (device == OutputHandler::LD_Console)145 case OutputHandler::LD_Console: 143 146 return Core::getInstance().softDebugLevelConsole_; 144 else if (device == OutputHandler::LD_Logfile)147 case OutputHandler::LD_Logfile: 145 148 return Core::getInstance().softDebugLevelLogfile_; 146 else if (device == OutputHandler::LD_Shell)149 case OutputHandler::LD_Shell: 147 150 return Core::getInstance().softDebugLevelShell_; 151 default: 152 assert(0); 153 } 148 154 } 149 155 -
code/trunk/src/core/RootGameState.cc
r1755 r1756 134 134 // start global orxonox time 135 135 Clock clock; 136 137 // create the Core settings to configure the output level 138 Core::getInstance(); 136 139 137 140 parseArguments(argc, argv);
Note: See TracChangeset
for help on using the changeset viewer.