Changeset 9869 in orxonox.OLD for trunk/src/lib/network/zip.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/network/zip.cc (modified) (2 diffs)

trunk/src/lib/network/zip.cc

@@ -15 +15 @@
 
 #include "zip.h"
-
-#include "src/lib/util/loading/resource_manager.h"
+#include "loading/resource_manager.h"
 #include "debug.h"
 
@@ -51 +50 @@
 int Zip::loadDictionary( std::string name )
 {
-  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  std::string fileName = Resources::ResourceManager::getInstance()->mainGlobalPath().name();
   //PRINTF(0)("datadir: %s\n", fileName.c_str());
   fileName = fileName + "/dicts/" + name;