Changeset 9833 in orxonox.OLD for branches/new_class_id/src/lib/script_engine/script.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/script_engine/script.cc (modified) (2 diffs)

branches/new_class_id/src/lib/script_engine/script.cc

@@ -18 +18 @@
 #include "luaincl.h"
 #include "debug.h"
-#include "util/loading/resource_manager.h"
-
+
+#include "loading/new_resource_manager.h"
 #include "loading/load_param.h"
 #include "parser/tinyxml/tinyxml.h"
@@ -100 +100 @@
 bool Script::loadFile(const std::string& filename)
  {
-   std::string filedest(ResourceManager::getInstance()->getDataDir());
+   std::string filedest(Resources::NewResourceManager::getInstance()->mainGlobalPath().name());
    filedest += "scripts/" + filename;