diff options
| author | Max Horn | 2008-09-04 20:03:08 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-04 20:03:08 +0000 |
| commit | 5409b2b456974418a5b99eaf914bc11188ad7cdb (patch) | |
| tree | d822bad804b5938ae210585a92a900be243eb3a5 /common/archive.cpp | |
| parent | cf7ab829e37c8cd782c6fcee3cd9ebfca48cc56c (diff) | |
| download | scummvm-rg350-5409b2b456974418a5b99eaf914bc11188ad7cdb.tar.gz scummvm-rg350-5409b2b456974418a5b99eaf914bc11188ad7cdb.tar.bz2 scummvm-rg350-5409b2b456974418a5b99eaf914bc11188ad7cdb.zip | |
Changed FSDirectory::getSubDirectory to return a FSDirectory pointer instead of a SharedPtr
svn-id: r34334
Diffstat (limited to 'common/archive.cpp')
| -rw-r--r-- | common/archive.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/common/archive.cpp b/common/archive.cpp index 575fa3857d..bdea62b895 100644 --- a/common/archive.cpp +++ b/common/archive.cpp @@ -93,14 +93,13 @@ SeekableReadStream *FSDirectory::openFile(const String &name) { return stream; } -SharedPtr<FSDirectory> FSDirectory::getSubDirectory(const String &name) { +FSDirectory *FSDirectory::getSubDirectory(const String &name) { if (name.empty() || !_node.isDirectory()) { - // return a null SharedPtr - return SharedPtr<FSDirectory>(); + return 0; } FilesystemNode node = lookupCache(_subDirCache, name); - return SharedPtr<FSDirectory>(new FSDirectory(node)); + return new FSDirectory(node); } void FSDirectory::cacheDirectoryRecursive(FilesystemNode node, int depth, const String& prefix) { |