diff options
author | Johannes Schickel | 2008-10-22 17:44:12 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-10-22 17:44:12 +0000 |
commit | 7d331b734186b6d3116debf34eb28bd6c3d807ed (patch) | |
tree | 9c4ae505beb7005ebd23118c4afb8c7eb8351ade /backends | |
parent | f881b95dddd5b9a2bf15179a2b4376f551a20bff (diff) | |
download | scummvm-rg350-7d331b734186b6d3116debf34eb28bd6c3d807ed.tar.gz scummvm-rg350-7d331b734186b6d3116debf34eb28bd6c3d807ed.tar.bz2 scummvm-rg350-7d331b734186b6d3116debf34eb28bd6c3d807ed.zip |
Committed updated version of my patch #2184529 "SearchSet: Get rid of SharedPtr usage".
svn-id: r34837
Diffstat (limited to 'backends')
-rw-r--r-- | backends/platform/sdl/sdl.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 1c7c2fd975..be69817d5a 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -282,8 +282,7 @@ void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) // FIXME: We use depth = 4 for now, to match the old code. May want to change that Common::FSNode dataNode(DATA_PATH); if (dataNode.exists() && dataNode.isDirectory()) { - Common::ArchivePtr dataArchive(new Common::FSDirectory(dataNode, 4)); - s.add(DATA_PATH, dataArchive, priority); + s.add(DATA_PATH, new Common::FSDirectory(dataNode, 4), priority); } #endif @@ -296,8 +295,7 @@ void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) if (CFURLGetFileSystemRepresentation(fileUrl, true, buf, sizeof(buf))) { // Success: Add it to the search path Common::String bundlePath((const char *)buf); - Common::ArchivePtr bundleArchive(new Common::FSDirectory(bundlePath)); - s.add("__OSX_BUNDLE__", bundleArchive, priority); + s.add("__OSX_BUNDLE__", new Common::FSDirectory(bundlePath), priority); } CFRelease(fileUrl); } |