[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.248,2.249 saveload.cpp,1.129,1.130 script_v5.cpp,1.217,1.218 script_v6.cpp,1.240,1.241 scumm.h,1.346,1.347 scummvm.cpp,2.532,2.533

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13833

Modified Files:
	gfx.cpp saveload.cpp script_v5.cpp script_v6.cpp scumm.h 
	scummvm.cpp 
Log Message:
cleanup

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.248
retrieving revision 2.249
diff -u -d -r2.248 -r2.249
--- gfx.cpp	4 Jan 2004 14:35:31 -0000	2.248
+++ gfx.cpp	4 Jan 2004 14:49:14 -0000	2.249
@@ -170,7 +170,7 @@
 		_roomPalette += 16;
 }
 
-void ScummEngine::initScreens(int b, int w, int h) {
+void ScummEngine::initScreens(int b, int h) {
 	int i;
 
 	for (i = 0; i < 3; i++) {
@@ -2264,7 +2264,7 @@
 			b = tab_2[i * 4 + 3];
 			if (t == b) {
 				while (l <= r) {
-					if (l >= 0 && l < gdi._numStrips && (uint) t < (uint) bottom) {
+					if (l >= 0 && l < gdi._numStrips && t < bottom) {
 						virtscr[0].tdirty[l] = t * 8;
 /*
 						//HACK: this is bad place of this hack
@@ -2272,10 +2272,10 @@
 		 				//this is only for maniac classic version becouse that game
 		 				//has bigger height of room gfx layer
 						if ((_version == 1) && (_gameId == GID_MANIAC))
-							virtscr[0].bdirty[l] = (t + 2) * 8;
+							virtscr[0].bdirty[l] = (b + 2) * 8;
 						else
 */
-							virtscr[0].bdirty[l] = (t + 1) * 8;
+							virtscr[0].bdirty[l] = (b + 1) * 8;
 					}
 					l++;
 				}

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- saveload.cpp	4 Jan 2004 00:44:40 -0000	1.129
+++ saveload.cpp	4 Jan 2004 14:49:14 -0000	1.130
@@ -205,7 +205,7 @@
 	}
 
 	// Restore the virtual screens and force a fade to black.
-	initScreens(_screenB, _screenWidth, _screenH);
+	initScreens(_screenB, _screenH);
 	VirtScreen *vs = &virtscr[0];
 	memset(vs->screenPtr + vs->xstart, 0, vs->width * vs->height);
 	vs->setDirtyRange(0, vs->height);

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- script_v5.cpp	3 Jan 2004 22:45:23 -0000	1.217
+++ script_v5.cpp	4 Jan 2004 14:49:14 -0000	1.218
@@ -1847,7 +1847,7 @@
 			a = getVarOrDirectWord(PARAM_1);
 			b = getVarOrDirectWord(PARAM_2);
 		}
-		initScreens(a, _screenWidth, b);
+		initScreens(a, b);
 		break;
 	case 4:		// SO_ROOM_PALETTE
 		if (_features & GF_SMALL_HEADER) {

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- script_v6.cpp	4 Jan 2004 13:49:03 -0000	1.240
+++ script_v6.cpp	4 Jan 2004 14:49:14 -0000	1.241
@@ -1526,7 +1526,7 @@
 	case 174:		// SO_ROOM_SCREEN
 		b = pop();
 		a = pop();
-		initScreens(a, _screenWidth, b);
+		initScreens(a, b);
 		break;
 
 	case 175:		// SO_ROOM_PALETTE

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -d -r1.346 -r1.347
--- scumm.h	4 Jan 2004 13:46:53 -0000	1.346
+++ scumm.h	4 Jan 2004 14:49:14 -0000	1.347
@@ -789,7 +789,7 @@
 	
 	StripTable *_roomStrips;
 
-	void initScreens(int b, int w, int h);
+	void initScreens(int b, int h);
 	void initVirtScreen(VirtScreenNumber slot, int number, int top, int width, int height, bool twobufs, bool scrollable);
 	void initBGBuffers(int height);
 	void initCycl(const byte *ptr);	// Color cycle

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.532
retrieving revision 2.533
diff -u -d -r2.532 -r2.533
--- scummvm.cpp	4 Jan 2004 14:00:57 -0000	2.532
+++ scummvm.cpp	4 Jan 2004 14:49:14 -0000	2.533
@@ -997,11 +997,11 @@
 	debug(9, "scummInit");
 
 	if ((_gameId == GID_MANIAC) && (_version == 1)) {
-		initScreens(16, _screenWidth, 152);
+		initScreens(16, 152);
 	} else if (_version >= 7) {
-		initScreens(0, _screenWidth, _screenHeight);
+		initScreens(0, _screenHeight);
 	} else {
-		initScreens(16, _screenWidth, 144);
+		initScreens(16, 144);
 	}
 
 	for (i = 0; i < 256; i++)