Changeset 6662 for code/branches/gamestates2/src/libraries/core/Resource.cc

Timestamp:

Mar 31, 2010, 1:05:28 AM (15 years ago)

Author:

rgrieder

Message:

Merged revisions 6621-6661 to gamestates2.

Location:

code/branches/gamestates2

Files:

• . (modified) (1 prop)
• src/libraries/core/Resource.cc (modified) (2 diffs)

code/branches/gamestates2/src/libraries/core/Resource.cc

@@ -29 +29 @@
 #include "Resource.h"
 
+#include <boost/filesystem/path.hpp>
 #include <OgreException.h>
+#include <OgreFileSystem.h>
 #include <OgreResourceGroupManager.h>
 
@@ -89 +91 @@
                 ptr->group = group;
                 ptr->size = it->uncompressedSize;
+                if (dynamic_cast<Ogre::FileSystemArchive*>(it->archive) != NULL)
+                {
+                    boost::filesystem::path base(it->archive->getName());
+                    base /= it->filename;
+                    ptr->fileSystemPath = base.string();
+                }
                 return ptr;
             }