Index: branches/new_class_id/src/orxonox.cc
===================================================================
--- branches/new_class_id/src/orxonox.cc	(revision 9817)
+++ branches/new_class_id/src/orxonox.cc	(revision 9836)
@@ -41,5 +41,5 @@
 #include "sound_engine.h"
 #include "util/loading/resource_manager.h"
-#include "util/loading/new_resource_manager.h"
+#include "util/loading/old_resource_manager.h"
 
 #include "cd_engine.h"
@@ -129,5 +129,5 @@
 
   // handlers
-  Resources::NewResourceManager::deleteInstance(); // deletes the Resource Manager
+  Resources::ResourceManager::deleteInstance(); // deletes the Resource Manager
 
   // engines
@@ -257,5 +257,5 @@
   GraphicsEngine::getInstance()->initFromPreferences();
 
-  std::string iconName = ResourceManager::getFullName("pictures/fighter-top-32x32.bmp");
+  std::string iconName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath("pictures/fighter-top-32x32.bmp");
   if (!iconName.empty())
   {
@@ -341,16 +341,16 @@
   if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""))!= "")
   {
-    Resources::NewResourceManager::getInstance()->setMainGlobalPath(dataPath) ;
-    if(!Resources::NewResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
+    Resources::ResourceManager::getInstance()->setMainGlobalPath(dataPath) ;
+    if(!Resources::ResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
     {
       PRINTF(1)("Data Could not be located in %s\n", dataPath.c_str());
     }
   }
-  while (!Resources::NewResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
+  while (!Resources::ResourceManager::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",
-              Resources::NewResourceManager::getInstance()->mainGlobalPath().name().c_str(),
+              Resources::ResourceManager::getInstance()->mainGlobalPath().name().c_str(),
               this->configFileName.c_str(),
               CONFIG_SECTION_GENERAL,
@@ -361,5 +361,5 @@
       return(-1);
     delete gui;
-    Resources::NewResourceManager::getInstance()->setMainGlobalPath(Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""));
+    Resources::ResourceManager::getInstance()->setMainGlobalPath(Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""));
   }
 
@@ -367,17 +367,17 @@
 
   //! @todo this is a hack and should be loadable
-  Resources::NewResourceManager::getInstance()->addResourceSubPath("Texture", "maps");
-  Resources::NewResourceManager::getInstance()->addResourceSubPath("Texture", "pictures");
-
-  Resources::NewResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "sound");
-  Resources::NewResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "music");
-
-  Resources::NewResourceManager::getInstance()->addKeepLevelName("Imediately");
-  Resources::NewResourceManager::getInstance()->addKeepLevelName("LevelEnd");
-  Resources::NewResourceManager::getInstance()->addKeepLevelName("CampaignEnd");
-  Resources::NewResourceManager::getInstance()->addKeepLevelName("GameEnd");
-
-
-  Resources::NewResourceManager::getInstance()->debug();
+  Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "maps");
+  Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "pictures");
+
+  Resources::ResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "sound");
+  Resources::ResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "music");
+
+  Resources::ResourceManager::getInstance()->addKeepLevelName("Imediately");
+  Resources::ResourceManager::getInstance()->addKeepLevelName("LevelEnd");
+  Resources::ResourceManager::getInstance()->addKeepLevelName("CampaignEnd");
+  Resources::ResourceManager::getInstance()->addKeepLevelName("GameEnd");
+
+
+  Resources::ResourceManager::getInstance()->debug();
   //  DynamicLoader::loadDyLib("libtest.so");
   return 0;
