[Scummvm-cvs-logs] CVS: scummex image.cpp,1.2,1.3 image.h,1.2,1.3 scummex.cpp,1.5,1.6

Adrien Mercier yoshizf at users.sourceforge.net
Fri Sep 19 15:32:18 CEST 2003


Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1:/tmp/cvs-serv14517

Modified Files:
	image.cpp image.h scummex.cpp 
Log Message:
_output is no more needed here

Index: image.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/image.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- image.cpp	18 Sep 2003 19:37:14 -0000	1.2
+++ image.cpp	19 Sep 2003 11:15:05 -0000	1.3
@@ -131,7 +131,7 @@
 	return 0;
 }
 
-int Image::drawObject(File& _input, BlockTable *_blockTable, int id, File& _output, int save)
+int Image::drawObject(File& _input, BlockTable *_blockTable, int id)
 {
 	int RMHDindex, CLUTindex, SMAPindex, TRNSindex;
 

Index: image.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/image.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- image.h	18 Sep 2003 19:37:14 -0000	1.2
+++ image.h	19 Sep 2003 11:15:05 -0000	1.3
@@ -47,7 +47,7 @@
 	~Image();
 	int drawPalette(BlockTable *_blockTable, int id, File& _input);
 	int drawBG(File& _input, BlockTable *_blockTable, int id, char* filename);
-	int drawObject(File& _input, BlockTable *_blockTable, int id, File& _output, int save = 0);
+	int drawObject(File& _input, BlockTable *_blockTable, int id);
 	void decode_uncompressed(uint16 height, File& _input);
 	void decode_horiz(uint16 height, uint8 compr, File& _input);
 	void decode_vert(uint16 height, uint8 compr, File& _input);

Index: scummex.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/scummex.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scummex.cpp	19 Sep 2003 01:36:40 -0000	1.5
+++ scummex.cpp	19 Sep 2003 11:15:05 -0000	1.6
@@ -267,7 +267,7 @@
 void ScummEX::objectDraw()
 {
 	_image = new Image();
-	_image->drawObject(_input, _blockTable, block_id, _input);
+	_image->drawObject(_input, _blockTable, block_id);
 }
 
 void ScummEX::FileInfo() {





More information about the Scummvm-git-logs mailing list