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

Timestamp:

Jul 8, 2005, 11:19:49 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: Singleton-Classes are now refered to as such in World and Orxonox

File:

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

orxonox/trunk/src/orxonox.cc

@@ -67 +67 @@
   this->setName("orxonox-main");
 
-  this->resourceManager = NULL;
-  this->objectManager = NULL;
-  this->eventHandler = NULL;
   this->iniParser = NULL;
 
@@ -186 +183 @@
   PRINT(3)("> Initializing input\n");
 
-  this->eventHandler = EventHandler::getInstance();
-  this->eventHandler->init();
+  EventHandler::getInstance()->init();
 
   return 0;
@@ -213 +209 @@
 
   PRINT(3)("initializing ResourceManager\n");
-  resourceManager = ResourceManager::getInstance();
 
   // create parser
@@ -231 +226 @@
     {
           //  printf("Not yet implemented\n");
-      if (!resourceManager->setDataDir(valuebuf))
+      if (!ResourceManager::getInstance()->setDataDir(valuebuf))
       {
         PRINTF(1)("Data Could not be located\n");
@@ -242 +237 @@
   }
 
-  if (!resourceManager->checkDataDir(DEFAULT_DATA_DIR_CHECKFILE))
+  if (!ResourceManager::getInstance()->checkDataDir(DEFAULT_DATA_DIR_CHECKFILE))
   {
     PRINTF(1)("The DataDirectory %s could not be verified\n" \
               "  Please Change in File %s Section %s Entry %s to a suitable value\n",
-              resourceManager->getDataDir(),
+              ResourceManager::getInstance()->getDataDir(),
               DEFAULT_CONFIG_FILE,
               CONFIG_SECTION_DATA,
@@ -253 +248 @@
   }
    //! \todo this is a hack and should be loadable
-  resourceManager->addImageDir(ResourceManager::getInstance()->getFullName("maps/"));
-  resourceManager->debug();
+  ResourceManager::getInstance()->addImageDir(ResourceManager::getInstance()->getFullName("maps/"));
+  ResourceManager::getInstance()->debug();
 
   PRINT(3)("initializing TextEngine\n");
@@ -260 +255 @@
 
   PRINT(3)("initializing ObjectManager\n");
-  this->objectManager = ObjectManager::getInstance();
-
+  ObjectManager::getInstance();
   CDEngine::getInstance();