[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.333,2.334 scumm.h,1.498,1.499

[Travis Howell]

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

Modified Files:
	gfx.cpp scumm.h 
Log Message:

Revert change, breaks draw of objects.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.333
retrieving revision 2.334
diff -u -d -r2.333 -r2.334
--- gfx.cpp	25 Sep 2004 22:43:44 -0000	2.333
+++ gfx.cpp	25 Sep 2004 23:14:09 -0000	2.334
@@ -1210,7 +1210,7 @@
 		sx = 0;
 	}
 
-	while (numstrip && sx < _numStrips && x * 8 < width) {
+	while (numstrip && sx < _numStrips && x * 8 < _vm->_roomWidth) {
 		CHECK_HEAP;
 
 		if (y < vs->tdirty[sx])

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -d -r1.498 -r1.499
--- scumm.h	25 Sep 2004 17:46:09 -0000	1.498
+++ scumm.h	25 Sep 2004 23:14:09 -0000	1.499
@@ -900,8 +900,8 @@
 protected:
 	/* Should be in Graphics class? */
 	uint16 _screenB, _screenH;
-	int _roomHeight, _roomWidth;
 public:
+	int _roomHeight, _roomWidth;
 	int _screenHeight, _screenWidth;
 	VirtScreen virtscr[4];		// Virtual screen areas
 	CameraData camera;			// 'Camera' - viewport