aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2
diff options
context:
space:
mode:
authorMax Horn2010-01-08 22:07:35 +0000
committerMax Horn2010-01-08 22:07:35 +0000
commit0cf53b025d8136a2f20ba405da1a696d0aa8767a (patch)
tree72e4241bf099c72e1f0a843c5632594f6b4947f5 /engines/sword2
parent474d49946f5254bff7ac6a490fcc3b02655fae23 (diff)
downloadscummvm-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/sword2')
-rw-r--r--engines/sword2/music.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index be3d6f4174..67d04c870d 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -66,7 +66,7 @@ public:
};
SafeSubReadStream::SafeSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end)
- : SeekableSubReadStream(parentStream, begin, end, Common::DisposeAfterUse::NO) {
+ : SeekableSubReadStream(parentStream, begin, end, DisposeAfterUse::NO) {
_previousPos = 0;
}
@@ -302,7 +302,7 @@ Audio::AudioStream *makePSXCLUStream(Common::File *file, int size) {
byte *buffer = (byte *)malloc(size);
file->read(buffer, size);
- return new Audio::VagStream(new Common::MemoryReadStream(buffer, size, Common::DisposeAfterUse::YES));
+ return new Audio::VagStream(new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES));
}
// ----------------------------------------------------------------------------