[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.300,1.301 base-costume.cpp,2.19,2.20 base-costume.h,1.27,1.28

[Max Horn]

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

Modified Files:
	actor.cpp base-costume.cpp base-costume.h 
Log Message:
Use Gdi::_numStrips in costume code (this allows us to be more flexible in how we compute _numStrips: from now on, only one place has to be changed for that)

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- actor.cpp	21 Sep 2004 21:10:21 -0000	1.300
+++ actor.cpp	24 Sep 2004 21:36:04 -0000	1.301
@@ -1090,7 +1090,7 @@
 
 	// If the actor is partially hidden, redraw it next frame.
 	// Only done for pre-AKOS, though.
-	if (bcr->drawCostume(_vm->virtscr[0], this, drawToBackBuf) & 1) {
+	if (bcr->drawCostume(_vm->virtscr[0], _vm->gdi._numStrips, this, drawToBackBuf) & 1) {
 		needRedraw = (_vm->_version <= 6);
 	}
 

Index: base-costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.cpp,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- base-costume.cpp	24 Sep 2004 07:36:29 -0000	2.19
+++ base-costume.cpp	24 Sep 2004 21:36:04 -0000	2.20
@@ -25,7 +25,7 @@
 
 namespace Scumm {
 
-byte BaseCostumeRenderer::drawCostume(const VirtScreen &vs, const Actor *a, bool drawToBackBuf) {
+byte BaseCostumeRenderer::drawCostume(const VirtScreen &vs, int numStrips, const Actor *a, bool drawToBackBuf) {
 	int i;
 	byte result = 0;
 
@@ -36,7 +36,7 @@
 
 	_outwidth = vs.pitch;
 	_outheight = vs.h;
-	_numStrips = _outwidth / 8;
+	_numStrips = numStrips;
 
 	if (_vm->_version == 1) {
 		_xmove = 0;

Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- base-costume.h	24 Sep 2004 20:37:24 -0000	1.27
+++ base-costume.h	24 Sep 2004 21:36:04 -0000	1.28
@@ -132,7 +132,7 @@
 	virtual void setCostume(int costume) = 0;
 
 
-	byte drawCostume(const VirtScreen &vs, const Actor *a, bool drawToBackBuf);
+	byte drawCostume(const VirtScreen &vs, int numStrips, const Actor *a, bool drawToBackBuf);
 
 protected: