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

Timestamp:

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

Author:

bensch

Message:

orxonox/new_class_id: almost killed off the old ResourceManager

File:

• branches/new_class_id/src/lib/util/loading/game_loader.cc (modified) (3 diffs)

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())
   {