diff options
author | Nicola Mettifogo | 2008-10-26 09:15:57 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2008-10-26 09:15:57 +0000 |
commit | 064b816b08cb27a5c8f4899d447c4b81597df968 (patch) | |
tree | 4d4641a515cb67830e8d0f532ffe8fdff79fa39b /engines/parallaction/disk_br.cpp | |
parent | e3312288d7e58235cb81acc2469519c470203c0d (diff) | |
download | scummvm-rg350-064b816b08cb27a5c8f4899d447c4b81597df968.tar.gz scummvm-rg350-064b816b08cb27a5c8f4899d447c4b81597df968.tar.bz2 scummvm-rg350-064b816b08cb27a5c8f4899d447c4b81597df968.zip |
Cleaned up disk code after recent updates to Common::SearchSet.
svn-id: r34848
Diffstat (limited to 'engines/parallaction/disk_br.cpp')
-rw-r--r-- | engines/parallaction/disk_br.cpp | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp index 20b1370796..cf5aec5285 100644 --- a/engines/parallaction/disk_br.cpp +++ b/engines/parallaction/disk_br.cpp @@ -140,23 +140,18 @@ void DosDisk_br::setLanguage(uint16 language) { _language = language; } -DosDisk_br::DosDisk_br(Parallaction* vm) : _vm(vm) { +DosDisk_br::DosDisk_br(Parallaction* vm) : Disk_br(vm) { } void DosDisk_br::init() { // TODO: clarify whether the engine or OSystem should add the base game directory to the search manager. // Right now, I am keeping an internal search set to do the job. - _baseDir = Common::SharedPtr<Common::FSDirectory>(new Common::FSDirectory(ConfMan.get("path"))); - // FIXME: We use this gross hack here since we switched SearchSet to accept plain pointers - _sset.add("base", _baseDir.get(), 5, false); + _baseDir = new Common::FSDirectory(ConfMan.get("path")); + _sset.add("base", _baseDir, 5, false); } -DosDisk_br::~DosDisk_br() { - _sset.clear(); -} - GfxObj* DosDisk_br::loadTalk(const char *name) { debugC(5, kDebugDisk, "DosDisk_br::loadTalk(%s)", name); @@ -391,16 +386,11 @@ DosDemoDisk_br::DosDemoDisk_br(Parallaction *vm) : DosDisk_br(vm) { void DosDemoDisk_br::init() { // TODO: clarify whether the engine or OSystem should add the base game directory to the search manager. // Right now, I am keeping an internal search set to do the job. - _baseDir = Common::SharedPtr<Common::FSDirectory>(new Common::FSDirectory(ConfMan.get("path"), 2)); - // FIXME: We use this gross hack here since we switched SearchSet to accept plain pointers - _sset.add("base", _baseDir.get(), 5, false); + _baseDir = new Common::FSDirectory(ConfMan.get("path"), 2); + _sset.add("base", _baseDir, 5, false); } -DosDemoDisk_br::~DosDemoDisk_br() { - -} - Common::String DosDemoDisk_br::selectArchive(const Common::String& name) { debugC(5, kDebugDisk, "DosDemoDisk_br::selectArchive"); Common::String oldPath = _currentPart; @@ -413,9 +403,8 @@ AmigaDisk_br::AmigaDisk_br(Parallaction *vm) : DosDisk_br(vm) { } void AmigaDisk_br::init() { - _baseDir = Common::SharedPtr<Common::FSDirectory>(new Common::FSDirectory(ConfMan.get("path"))); - // FIXME: We use this gross hack here since we switched SearchSet to accept plain pointers - _sset.add("base", _baseDir.get(), 5, false); + _baseDir = new Common::FSDirectory(ConfMan.get("path")); + _sset.add("base", _baseDir, 5, false); const Common::String subDirNames[3] = { "fonts", "backs", "common" }; const Common::String subDirPrefixes[3] = { "fonts", "backs", Common::String::emptyString }; @@ -423,11 +412,6 @@ void AmigaDisk_br::init() { _sset.add(subDirNames[i], _baseDir->getSubDirectory(subDirPrefixes[i], subDirNames[i], 2), 6); } -AmigaDisk_br::~AmigaDisk_br() { - _sset.clear(); -} - - void AmigaDisk_br::loadBackground(BackgroundInfo& info, Common::SeekableReadStream &stream) { byte *pal; @@ -629,4 +613,15 @@ Common::String AmigaDisk_br::selectArchive(const Common::String& name) { } +Disk_br::Disk_br(Parallaction *vm) : _vm(vm), _baseDir(0) { + +} + +Disk_br::~Disk_br() { + delete _baseDir; + _sset.clear(); +} + + + } // namespace Parallaction |