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

Timestamp:

Jun 20, 2006, 1:39:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

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

trunk/src/lib/network/zip.cc

@@ -49 +49 @@
  * @return true on success
  */
-bool Zip::loadDictionary( std::string name )
+int Zip::loadDictionary( std::string name )
 {
   std::string fileName = ResourceManager::getInstance()->getDataDir();
@@ -61 +61 @@
   {
     PRINTF(1)("Could not open %d\n", fileName.c_str());
-    return false;
+    return -1;
   }
 
@@ -88 +88 @@
   PRINTF(3)("Loaded dictionary '%s' with adler = %d\n", name.c_str(), entry.adler );
 
-  return true;
+  return dicts.size()-1;
 }