[Scummvm-cvs-logs] CVS: scummvm/scumm util.cpp,2.8,2.9 util.h,2.8,2.9

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16412

Modified Files:
	util.cpp util.h 
Log Message:
Extract code works will any WriteStream, not just MemoryWriteStream

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/util.cpp,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- util.cpp	10 Apr 2005 12:59:16 -0000	2.8
+++ util.cpp	28 Apr 2005 21:02:42 -0000	2.9
@@ -751,14 +751,14 @@
 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 @@
 	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;

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/util.h,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- util.h	22 Apr 2005 17:40:08 -0000	2.8
+++ util.h	28 Apr 2005 21:02:43 -0000	2.9
@@ -84,7 +84,7 @@
 
 	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);