Changeset 9833 in orxonox.OLD for branches/new_class_id/src/lib/util

Timestamp:

Sep 26, 2006, 4:59:49 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: almost killed off the old ResourceManager

Location:

branches/new_class_id/src/lib/util/loading

Files:

• game_loader.cc (modified) (3 diffs)
• new_resource_manager.cc (modified) (1 diff)
• new_resource_manager.h (modified) (1 diff)

branches/new_class_id/src/lib/util/loading/game_loader.cc

@@ -20 +20 @@
 #include "game_loader.h"
 #include "util/loading/load_param.h"
-
+#include "util/loading/new_resource_manager.h"
 #include "debug.h"
 #include "campaign.h"
-
-#include "util/loading/resource_manager.h"
 
 #include "key_mapper.h"
@@ -85 +83 @@
 {
   ErrorMessage errorCode;
-  std::string campaignName = ResourceManager::getFullName(fileName);
+  std::string campaignName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName);
   if (!campaignName.empty())
   {
@@ -105 +103 @@
 {
   ErrorMessage errorCode;
-  std::string campaignName = ResourceManager::getFullName(fileName);
+  std::string campaignName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName);
   if (!campaignName.empty())
   {

branches/new_class_id/src/lib/util/loading/new_resource_manager.cc

@@ -120 +120 @@
   }
 
+  std::string NewResourceManager::prependAbsoluteMainPath(const std::string& fileName)
+  {
+    return (this->_mainGlobalPath + File(fileName)).name();
+  }
 
 

branches/new_class_id/src/lib/util/loading/new_resource_manager.h

@@ -44 +44 @@
 
     bool checkFileInMainPath(const File& fileInside);
+    std::string prependAbsoluteMainPath(const std::string& fileName);
 
     bool unloadAllByKeepLevel(const Resources::KeepLevel& keepLevel);