[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,1.30,1.31 string.cpp,1.18,1.19 gfx.cpp,1.21,1.22

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv27660/scumm

Modified Files:
	scummvm.cpp string.cpp gfx.cpp 
Log Message:
trivial cleanup

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- scummvm.cpp	21 Sep 2002 14:17:13 -0000	1.30
+++ scummvm.cpp	21 Sep 2002 16:20:52 -0000	1.31
@@ -92,8 +92,7 @@
 	if (_gameId == GID_ZAK256) {	// FmTowns is 320x240
 		_realWidth = 320;
 		_realHeight = 240;
-	}
-	else if (_gameId == GID_CMI) {
+	} else if (_gameId == GID_CMI) {
 		_realWidth = 640;
 		_realHeight = 480;
 	} else {
@@ -583,15 +582,13 @@
 		_vars[VAR_V6_SCREEN_HEIGHT] = _scrHeight;
 	}
 
+	_vars[VAR_CAMERA_MIN_X] = _realWidth / 2;
+	_vars[VAR_CAMERA_MAX_X] = _scrWidth - (_realWidth / 2);
+
 	if (_features & GF_AFTER_V7) {
-		_vars[VAR_CAMERA_MIN_X] = _realWidth / 2;
-		_vars[VAR_CAMERA_MAX_X] = _scrWidth - (_realWidth / 2);
 		_vars[VAR_CAMERA_MIN_Y] = _realHeight / 2;
 		_vars[VAR_CAMERA_MAX_Y] = _scrHeight - (_realHeight / 2);
 		setCameraAt(_realWidth / 2, _realHeight / 2);
-	} else {
-		_vars[VAR_CAMERA_MAX_X] = _scrWidth - (_realWidth / 2);
-		_vars[VAR_CAMERA_MIN_X] = _realWidth / 2;
 	}
 
 	if (_roomResource == 0)

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- string.cpp	20 Sep 2002 23:40:55 -0000	1.18
+++ string.cpp	21 Sep 2002 16:20:52 -0000	1.19
@@ -226,7 +226,6 @@
 				string[0].ypos = 1;
 
 			if (string[0].ypos < camera._cur.y - (_realHeight / 2))
-
 				string[0].ypos = camera._cur.y - (_realHeight / 2);
 
 			s = a->scalex * a->new_2 / 0xFF;

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gfx.cpp	21 Sep 2002 14:17:12 -0000	1.21
+++ gfx.cpp	21 Sep 2002 16:20:52 -0000	1.22
@@ -71,7 +71,7 @@
 	}
 	initVirtScreen(0, 0, b, _realWidth, h - b, true, true);
 	initVirtScreen(1, 0, 0, _realWidth, b, false, false);
-	initVirtScreen(2, 0, h, _realWidth, _realHeight - h, false, false);	//ender
+	initVirtScreen(2, 0, h, _realWidth, _realHeight - h, false, false);
 
 	_screenB = b;
 	_screenH = h;