Changeset 5285 in orxonox.OLD for trunk/src/orxonox.cc

Timestamp:

Oct 6, 2005, 8:31:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: nicer quit-modi
TextEngine is now deleted by GraphicsEngine
trying to fix errors in the Element2D deletion

File:

• trunk/src/orxonox.cc (modified) (2 diffs)

trunk/src/orxonox.cc

@@ -86 +86 @@
 Orxonox::~Orxonox ()
 {
-  delete GraphicsEngine::getInstance(); // deleting the Graphics
-  delete TextEngine::getInstance();
-  delete SoundEngine::getInstance();
-  delete ResourceManager::getInstance(); // deletes the Resource Manager
-  delete TextEngine::getInstance();
+  // game-specific
+  delete GameLoader::getInstance();
+  delete GarbageCollector::getInstance();
+
+  // class-less services/factories
   delete Factory::getFirst();
-  delete GameLoader::getInstance();
-  delete SoundEngine::getInstance();
-  delete CDEngine::getInstance();
-  delete GarbageCollector::getInstance();
   FastFactory::deleteAll();
   ShellCommandBase::debug();
   ShellCommandClass::unregisterAllCommands();
   ShellCommandBase::debug();
+  LoadClassDescription::deleteAllDescriptions();
+
+  // engines
+  delete CDEngine::getInstance();
+  delete SoundEngine::getInstance();
+  delete GraphicsEngine::getInstance(); // deleting the Graphics
+  delete EventHandler::getInstance();
+
+  // handlers
+  delete ResourceManager::getInstance(); // deletes the Resource Manager
+  // output-buffer
   delete ShellBuffer::getInstance();
 
-  LoadClassDescription::deleteAllDescriptions();
-
-  delete EventHandler::getInstance();
+  // orxonox class-stuff
   delete this->iniParser;
   delete[] this->configFileName;
@@ -283 +288 @@
   delete[] imageDir;
 
-  PRINT(3)("initializing TextEngine\n");
-  TextEngine::getInstance();
-
   CDEngine::getInstance();
   return 0;