[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.24,1.25 gfx.cpp,1.52,1.53 object.cpp,1.10,1.11 scumm.h,1.55,1.56

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv1128

Modified Files:
	akos.cpp gfx.cpp object.cpp scumm.h 
Log Message:
removed unused parameters from drawBomp

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- akos.cpp	6 Nov 2002 07:28:38 -0000	1.24
+++ akos.cpp	6 Nov 2002 14:54:21 -0000	1.25
@@ -926,9 +926,9 @@
 	if (clipping != 0) {
 		_vm->_bompMaskPtr = _vm->getResourceAddress(rtBuffer, 9) + _vm->_screenStartStrip + _vm->gdi._imgBufOffs[clipping];
 		_vm->_bompMaskPitch = _vm->_realWidth / 8;
-		_vm->drawBomp(&bdd, 0, bdd.dataptr, decode_mode, 1);
+		_vm->drawBomp(&bdd, decode_mode, 1);
 	} else {
-		_vm->drawBomp(&bdd, 0, bdd.dataptr, decode_mode, 0);
+		_vm->drawBomp(&bdd, decode_mode, 0);
 	}
 
 	_vm->_bompActorPalletePtr = NULL;

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- gfx.cpp	6 Nov 2002 13:50:53 -0000	1.52
+++ gfx.cpp	6 Nov 2002 14:54:21 -0000	1.53
@@ -3246,7 +3246,7 @@
 	}
 }
 
-void Scumm::drawBomp(BompDrawData * bd, int param1, byte * data_ptr, int decode_mode, int mask) {
+void Scumm::drawBomp(BompDrawData * bd, int decode_mode, int mask) {
 	byte skip_y = 128;
 	byte skip_y_new = 0;	// FIXME - is this a sensible default value?
 	byte bits = 0;	// FIXME - is this a sensible default value?

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- object.cpp	6 Nov 2002 14:02:07 -0000	1.10
+++ object.cpp	6 Nov 2002 14:54:21 -0000	1.11
@@ -1260,10 +1260,10 @@
 		_bompScallingYPtr = bomp_scalling_y;
 		_bompScaleRight = setupBompScale(_bompScallingXPtr, bdd.srcwidth, bdd.scale_x);
 		_bompScaleBottom = setupBompScale(_bompScallingYPtr, bdd.srcheight, bdd.scale_y);
-		drawBomp(&bdd, 0, bdd.dataptr, 1, 3);
+		drawBomp(&bdd, 1, 3);
 	}	else {
 		_bompShadowMode = eo->mode;
-		drawBomp(&bdd, 0, bdd.dataptr, 1, 0);
+		drawBomp(&bdd, 1, 0);
 	}
 
 	_bompShadowMode = 0;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- scumm.h	6 Nov 2002 14:19:50 -0000	1.55
+++ scumm.h	6 Nov 2002 14:54:21 -0000	1.56
@@ -851,7 +851,7 @@
 
 	// bomp
 	void decompressBomp(byte *dst, byte *src, int w, int h);
-	void drawBomp(BompDrawData * bd, int param1, byte *data_ptr, int decode_mode, int mask);
+	void drawBomp(BompDrawData * bd, int decode_mode, int mask);
 	int32 setupBompScale(byte * scalling, int32 size, byte scale);
 	void bompScaleFuncX(byte * line_buffer, byte * scalling_x_ptr, byte skip, int32 size);
 	int32 bompDecodeLineMode0(byte * src, byte * line_buffer, int32 size);