[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.238,2.239 saveload.cpp,1.126,1.127 script_v5.cpp,1.215,1.216 script_v6.cpp,1.237,1.238 scumm.h,1.342,1.343 scummvm.cpp,2.527,2.528

Max Horn fingolfin at users.sourceforge.net
Sat Jan 3 13:27:06 CET 2004


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

Modified Files:
	gfx.cpp saveload.cpp script_v5.cpp script_v6.cpp scumm.h 
	scummvm.cpp 
Log Message:
removed unused param in initScreens

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.238
retrieving revision 2.239
diff -u -d -r2.238 -r2.239
--- gfx.cpp	3 Jan 2004 21:22:06 -0000	2.238
+++ gfx.cpp	3 Jan 2004 21:26:44 -0000	2.239
@@ -215,7 +215,7 @@
 	int i;
 
 	for (i = 10; i != 0; i--) {
-		initScreens(0, 0, _screenWidth, _screenHeight);
+		initScreens(0, _screenWidth, _screenHeight);
 	}
 
 	if (VAR_PERFORMANCE_1 != 0xFF)	// Variable is reserved for game scripts in earlier games
@@ -230,9 +230,9 @@
 		VAR(VAR_PERFORMANCE_2) = 0;
 
 	if (_version >= 7)
-		initScreens(0, 0, _screenWidth, _screenHeight);
+		initScreens(0, _screenWidth, _screenHeight);
 	else
-		initScreens(0, 16, _screenWidth, 144);
+		initScreens(16, _screenWidth, 144);
 }
 
 void ScummEngine::initScreens(int a, int b, int w, int h) {

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- saveload.cpp	27 Dec 2003 00:10:20 -0000	1.126
+++ saveload.cpp	3 Jan 2004 21:26:44 -0000	1.127
@@ -161,7 +161,7 @@
 	gdi._mask.right = gdi._mask.bottom = 0;
 	_charset->_hasMask = false;
 
-	initScreens(0, 0, _screenWidth, _screenHeight);
+	initScreens(0, _screenWidth, _screenHeight);
 
 	// Force a fade to black
 	int old_screenEffectFlag = _screenEffectFlag;
@@ -169,7 +169,7 @@
 	fadeOut(129);
 	_screenEffectFlag = old_screenEffectFlag ? true : false;
 
-	initScreens(0, sb, _screenWidth, sh);
+	initScreens(sb, _screenWidth, sh);
 
 	_completeScreenRedraw = true;
 

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- script_v5.cpp	26 Dec 2003 23:11:34 -0000	1.215
+++ script_v5.cpp	3 Jan 2004 21:26:44 -0000	1.216
@@ -1847,7 +1847,7 @@
 			a = getVarOrDirectWord(PARAM_1);
 			b = getVarOrDirectWord(PARAM_2);
 		}
-		initScreens(0, a, _screenWidth, b);
+		initScreens(a, _screenWidth, 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.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- script_v6.cpp	2 Jan 2004 15:07:14 -0000	1.237
+++ script_v6.cpp	3 Jan 2004 21:26:44 -0000	1.238
@@ -1526,7 +1526,7 @@
 	case 174:		// SO_ROOM_SCREEN
 		b = pop();
 		a = pop();
-		initScreens(0, a, _screenWidth, b);
+		initScreens(a, _screenWidth, b);
 		break;
 
 	case 175:		// SO_ROOM_PALETTE

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -d -r1.342 -r1.343
--- scumm.h	30 Dec 2003 06:24:47 -0000	1.342
+++ scumm.h	3 Jan 2004 21:26:44 -0000	1.343
@@ -792,7 +792,7 @@
 	StripTable *_roomStrips;
 
 	void getGraphicsPerformance();
-	void initScreens(int a, int b, int w, int h);
+	void initScreens(int b, int w, int h);
 	void initVirtScreen(int 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.527
retrieving revision 2.528
diff -u -d -r2.527 -r2.528
--- scummvm.cpp	3 Jan 2004 21:22:07 -0000	2.527
+++ scummvm.cpp	3 Jan 2004 21:26:44 -0000	2.528
@@ -1019,11 +1019,11 @@
 	debug(9, "scummInit");
 
 	if ((_gameId == GID_MANIAC) && (_version == 1)) {
-		initScreens(0, 16, _screenWidth, 152);
+		initScreens(16, _screenWidth, 152);
 	} else if (_version >= 7) {
-		initScreens(0, 0, _screenWidth, _screenHeight);
+		initScreens(0, _screenWidth, _screenHeight);
 	} else {
-		initScreens(0, 16, _screenWidth, 144);
+		initScreens(16, _screenWidth, 144);
 	}
 
 	for (i = 0; i < 256; i++)





More information about the Scummvm-git-logs mailing list