[Scummvm-cvs-logs] CVS: scummvm/scumm camera.cpp,2.27,2.28 scumm.cpp,1.117,1.118 scumm.h,1.438,1.439

Max Horn fingolfin at users.sourceforge.net
Sat Aug 14 08:24:12 CEST 2004


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

Modified Files:
	camera.cpp scumm.cpp scumm.h 
Log Message:
Get rid of _screenLeft

Index: camera.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/camera.cpp,v
retrieving revision 2.27
retrieving revision 2.28
diff -u -d -r2.27 -r2.28
--- camera.cpp	22 Jul 2004 04:37:20 -0000	2.27
+++ camera.cpp	14 Aug 2004 15:23:44 -0000	2.28
@@ -314,6 +314,7 @@
 
 
 void ScummEngine::cameraMoved() {
+	int screenLeft;
 	if (_features & GF_NEW_CAMERA) {
 		assert(camera._cur.x >= (_screenWidth / 2) && camera._cur.y >= (_screenHeight / 2));
 	} else {
@@ -329,13 +330,13 @@
 
 	_screenTop = camera._cur.y - (_screenHeight / 2);
 	if (_features & GF_NEW_CAMERA) {
-		_screenLeft = camera._cur.x - (_screenWidth / 2);
+		screenLeft = camera._cur.x - (_screenWidth / 2);
 	} else {
-		_screenLeft = _screenStartStrip * 8;
+		screenLeft = _screenStartStrip * 8;
 	}
 
 #ifdef V7_SMOOTH_SCROLLING_HACK
-	virtscr[0].xstart = _screenLeft;
+	virtscr[0].xstart = screenLeft;
 #else
 	virtscr[0].xstart = _screenStartStrip * 8;
 #endif

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- scumm.cpp	14 Aug 2004 03:16:32 -0000	1.117
+++ scumm.cpp	14 Aug 2004 15:23:44 -0000	1.118
@@ -582,7 +582,6 @@
 	_shakeFrame = 0;
 	_screenStartStrip = 0;
 	_screenEndStrip = 0;
-	_screenLeft = 0;
 	_screenTop = 0;
 	_blastObjectQueuePos = 0;
 	memset(_blastObjectQueue, 0, sizeof(_blastObjectQueue));

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -d -r1.438 -r1.439
--- scumm.h	14 Aug 2004 02:44:16 -0000	1.438
+++ scumm.h	14 Aug 2004 15:23:44 -0000	1.439
@@ -986,7 +986,7 @@
 
 public:
 	int _screenStartStrip, _screenEndStrip;
-	int _screenLeft, _screenTop;
+	int 	_screenTop;
 
 protected:
 	int _blastObjectQueuePos; 





More information about the Scummvm-git-logs mailing list