diff options
| author | Max Horn | 2010-01-08 22:07:35 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-08 22:07:35 +0000 |
| commit | 0cf53b025d8136a2f20ba405da1a696d0aa8767a (patch) | |
| tree | 72e4241bf099c72e1f0a843c5632594f6b4947f5 /engines/parallaction | |
| parent | 474d49946f5254bff7ac6a490fcc3b02655fae23 (diff) | |
| download | scummvm-rg350-0cf53b025d8136a2f20ba405da1a696d0aa8767a.tar.gz scummvm-rg350-0cf53b025d8136a2f20ba405da1a696d0aa8767a.tar.bz2 scummvm-rg350-0cf53b025d8136a2f20ba405da1a696d0aa8767a.zip | |
Move DisposeAfterUse::Flag from Common to global namespace, and into a new header common/types.h
svn-id: r47180
Diffstat (limited to 'engines/parallaction')
| -rw-r--r-- | engines/parallaction/disk_ns.cpp | 4 | ||||
| -rw-r--r-- | engines/parallaction/font.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp index cd036e87d0..91df44e83d 100644 --- a/engines/parallaction/disk_ns.cpp +++ b/engines/parallaction/disk_ns.cpp @@ -133,7 +133,7 @@ Common::SeekableReadStream *NSArchive::createReadStreamForMember(const Common::S int offset = _archiveOffsets[index]; int endOffset = _archiveOffsets[index] + _archiveLenghts[index]; - return new Common::SeekableSubReadStream(_stream, offset, endOffset, Common::DisposeAfterUse::NO); + return new Common::SeekableSubReadStream(_stream, offset, endOffset, DisposeAfterUse::NO); } bool NSArchive::hasFile(const Common::String &name) { @@ -670,7 +670,7 @@ public: ppDecrunchBuffer(src, dest, crlen-8, decrlen); free(src); - _stream = new Common::MemoryReadStream(dest, decrlen, Common::DisposeAfterUse::YES); + _stream = new Common::MemoryReadStream(dest, decrlen, DisposeAfterUse::YES); _dispose = true; } diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp index eb8869b537..d1c67f1338 100644 --- a/engines/parallaction/font.cpp +++ b/engines/parallaction/font.cpp @@ -678,7 +678,7 @@ void Parallaction_ns::initFonts() { _introFont = _disk->loadFont("slide"); } else { _dialogueFont = _disk->loadFont("comic"); - Common::MemoryReadStream stream(_amigaTopazFont, 2600, Common::DisposeAfterUse::NO); + Common::MemoryReadStream stream(_amigaTopazFont, 2600, DisposeAfterUse::NO); _labelFont = new AmigaFont(stream); _menuFont = _disk->loadFont("slide"); _introFont = _disk->loadFont("intro"); |