[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.497,1.498 gfx.cpp,2.329,2.330

[Max Horn]

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

Modified Files:
	scumm.h gfx.cpp 
Log Message:
Cleanup / correction

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -d -r1.497 -r1.498
--- scumm.h	25 Sep 2004 16:30:14 -0000	1.497
+++ scumm.h	25 Sep 2004 17:46:09 -0000	1.498
@@ -900,11 +900,6 @@
 protected:
 	/* Should be in Graphics class? */
 	uint16 _screenB, _screenH;
-
-//#ifdef V7_SMOOTH_SCROLLING_HACK
-//(see gfx.cpp line 1222)
-public: // HACK HACK HACK
-//#endif
 	int _roomHeight, _roomWidth;
 public:
 	int _screenHeight, _screenWidth;

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.329
retrieving revision 2.330
diff -u -d -r2.329 -r2.330
--- gfx.cpp	25 Sep 2004 11:40:40 -0000	2.329
+++ gfx.cpp	25 Sep 2004 17:46:23 -0000	2.330
@@ -1176,11 +1176,13 @@
 	if (_vm->_features & GF_SMALL_HEADER) {
 		smap_ptr = ptr;
 	} else if (_vm->_version == 8) {
-		// Skip to the skip to the BSTR->WRAP->OFFS chunk
+		// Skip to the BSTR->WRAP->OFFS chunk
 		smap_ptr = ptr + 24;
 	} else
 		smap_ptr = _vm->findResource(MKID('SMAP'), ptr);
 
+Common::hexdump(smap_ptr - 24, 48);
+
 	if (!smap_ptr) {
 		// This will go away eventually. HE 7.2 titles used different function
 		// here which read BMAP. But it was replaced not in every place. So
@@ -1219,7 +1221,7 @@
 		sx = 0;
 	}
 
-	while (numstrip && sx < _numStrips && x * 8 < _vm->_roomWidth) {
+	while (numstrip && sx < _numStrips && x * 8 < width) {
 		CHECK_HEAP;
 
 		if (y < vs->tdirty[sx])