diff options
author | Max Horn | 2005-04-28 21:02:43 +0000 |
---|---|---|
committer | Max Horn | 2005-04-28 21:02:43 +0000 |
commit | e8865cc596a19c8604f37432dd890138185b18f9 (patch) | |
tree | ecb9a2120a5180bf92b0242d63c2912db30d5925 /scumm | |
parent | b515dd1333364a6478c630fe0556a1dd7bc846d9 (diff) | |
download | scummvm-rg350-e8865cc596a19c8604f37432dd890138185b18f9.tar.gz scummvm-rg350-e8865cc596a19c8604f37432dd890138185b18f9.tar.bz2 scummvm-rg350-e8865cc596a19c8604f37432dd890138185b18f9.zip |
Extract code works will any WriteStream, not just MemoryWriteStream
svn-id: r17854
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/util.cpp | 6 | ||||
-rw-r--r-- | scumm/util.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scumm/util.cpp b/scumm/util.cpp index 7e723ba830..2df1c8193b 100644 --- a/scumm/util.cpp +++ b/scumm/util.cpp @@ -751,14 +751,14 @@ static ScummNESFile::Resource res_charset = static ScummNESFile::Resource res_preplist = { {0x3FB5A,0x3FB90,0x3FBA9,0x3FBAF}, {0x000E,0x000E,0x000E,0x0010}, NES_PREPLIST }; -uint16 write_byte(Common::MemoryWriteStream *out, byte val) { +uint16 write_byte(Common::WriteStream *out, byte val) { val ^= 0xFF; if (out != 0) out->writeByte(val); return 1; } -uint16 write_word(Common::MemoryWriteStream *out, uint16 val) { +uint16 write_word(Common::WriteStream *out, uint16 val) { val ^= 0xFFFF; if (out != 0) out->writeUint16LE(val); @@ -783,7 +783,7 @@ uint16 ScummNESFile::resLength(Resource *res) { return res->length[_ROMset]; } -uint16 ScummNESFile::extractResource(Common::MemoryWriteStream *output, Resource *res) { +uint16 ScummNESFile::extractResource(Common::WriteStream *output, Resource *res) { uint16 len, i, j; byte val; byte cnt; diff --git a/scumm/util.h b/scumm/util.h index 4bef2ebe81..c2d3af92cb 100644 --- a/scumm/util.h +++ b/scumm/util.h @@ -84,7 +84,7 @@ private: bool generateIndex(); bool generateResource(int res); - uint16 extractResource(Common::MemoryWriteStream *out, Resource *res); + uint16 extractResource(Common::WriteStream *out, Resource *res); uint32 resOffset(Resource *res); uint16 resLength(Resource *res); |