Changeset 9800 in orxonox.OLD for branches/new_class_id/src/orxonox.cc

Timestamp:

Sep 24, 2006, 12:12:14 PM (18 years ago)

Author:

bensch

Message:

namespaces

File:

• branches/new_class_id/src/orxonox.cc (modified) (4 diffs)

branches/new_class_id/src/orxonox.cc

@@ -129 +129 @@
 
   // handlers
-  NewResourceManager::deleteInstance(); // deletes the Resource Manager
+  Resources::NewResourceManager::deleteInstance(); // deletes the Resource Manager
 
   // engines
@@ -341 +341 @@
   if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""))!= "")
   {
-    NewResourceManager::getInstance()->setMainGlobalPath(dataPath) ;
-    if(!NewResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
+    Resources::NewResourceManager::getInstance()->setMainGlobalPath(dataPath) ;
+    if(!Resources::NewResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
     {
       PRINTF(1)("Data Could not be located in %s\n", dataPath.c_str());
     }
   }
-  while (!NewResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
+  while (!Resources::NewResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
   {
 
     PRINTF(1)("The DataDirectory %s could not be verified\n\nh" \
               "!!!  Please Change in File %s Section %s Entry %s to a suitable value !!!\n",
-              NewResourceManager::getInstance()->mainGlobalPath().name().c_str(),
+              Resources::NewResourceManager::getInstance()->mainGlobalPath().name().c_str(),
               this->configFileName.c_str(),
               CONFIG_SECTION_GENERAL,
@@ -361 +361 @@
       return(-1);
     delete gui;
-    NewResourceManager::getInstance()->setMainGlobalPath(Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""));
+    Resources::NewResourceManager::getInstance()->setMainGlobalPath(Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""));
   }
 
@@ -367 +367 @@
 
   //! @todo this is a hack and should be loadable
-  NewResourceManager::getInstance()->addResourceSubPath("Texture", "maps");
-  NewResourceManager::getInstance()->addResourceSubPath("Texture", "pictures");
-
-  NewResourceManager::getInstance()->addKeepLevelName("Imediately");
-  NewResourceManager::getInstance()->addKeepLevelName("LevelEnd");
-  NewResourceManager::getInstance()->addKeepLevelName("CampaignEnd");
-  NewResourceManager::getInstance()->addKeepLevelName("GameEnd");
-
-
-  NewResourceManager::getInstance()->debug();
+  Resources::NewResourceManager::getInstance()->addResourceSubPath("Texture", "maps");
+  Resources::NewResourceManager::getInstance()->addResourceSubPath("Texture", "pictures");
+
+  Resources::NewResourceManager::getInstance()->addKeepLevelName("Imediately");
+  Resources::NewResourceManager::getInstance()->addKeepLevelName("LevelEnd");
+  Resources::NewResourceManager::getInstance()->addKeepLevelName("CampaignEnd");
+  Resources::NewResourceManager::getInstance()->addKeepLevelName("GameEnd");
+
+
+  Resources::NewResourceManager::getInstance()->debug();
   //  DynamicLoader::loadDyLib("libtest.so");
   return 0;