Changeset 5929 for code/trunk/src/libraries/core/MemoryArchive.cc

Timestamp:

Oct 12, 2009, 8:20:07 PM (16 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/MemoryArchive.cc (modified) (3 diffs)

code/trunk/src/libraries/core/MemoryArchive.cc

@@ -68 +68 @@
                 continue;
             if (bDirs)
-                file = file.parent_path();
+                file = file.branch_path();
             if (file.empty())
                 continue;
-            if (file.has_parent_path() && !bRecursive)
+            if (file.has_branch_path() && !bRecursive)
                 continue;
             if (simpleList)
@@ -80 +80 @@
                 fi.archive = this;
                 fi.filename = file.string();
-                fi.basename = file.filename();
-                fi.path = file.parent_path().string();
+                fi.basename = file.leaf();
+                fi.path = file.branch_path().string();
                 fi.compressedSize = it->second.second;
                 fi.uncompressedSize = it->second.second;
@@ -119 +119 @@
 
     bool MemoryArchive::exists(const String& filename)
-        {
+    {
         const FileMap& files = archives_s[this->getName()];
         return files.find(filename) != files.end();
-        }
+    }
 
     const Ogre::String& MemoryArchiveFactory::getType(void) const