[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.34,2.35 actor.cpp,1.71,1.72

Max Horn fingolfin at users.sourceforge.net
Mon Mar 24 13:57:15 CET 2003


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

Modified Files:
	gfx.cpp actor.cpp 
Log Message:
cleanup

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.34
retrieving revision 2.35
diff -u -d -r2.34 -r2.35
--- gfx.cpp	13 Mar 2003 02:23:55 -0000	2.34
+++ gfx.cpp	24 Mar 2003 21:56:29 -0000	2.35
@@ -1719,20 +1719,17 @@
 			runScript(_vars[VAR_SCROLL_SCRIPT], 0, 0, 0);
 		}
 	} else {
-		int t;
 
 		if (camera._mode != CM_FOLLOW_ACTOR || abs(pos_x - camera._cur.x) > (_realWidth / 2)) {
 			camera._cur.x = pos_x;
 		}
 		camera._dest.x = pos_x;
 
-		t = _vars[VAR_CAMERA_MIN_X];
-		if (camera._cur.x < t)
-			camera._cur.x = t;
+		if (camera._cur.x < _vars[VAR_CAMERA_MIN_X])
+			camera._cur.x = _vars[VAR_CAMERA_MIN_X];
 
-		t = _vars[VAR_CAMERA_MAX_X];
-		if (camera._cur.x > t)
-			camera._cur.x = t;
+		if (camera._cur.x > _vars[VAR_CAMERA_MAX_X])
+			camera._cur.x = _vars[VAR_CAMERA_MAX_X];
 
 		if (_vars[VAR_SCROLL_SCRIPT]) {
 			_vars[VAR_CAMERA_POS_X] = camera._cur.x;

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- actor.cpp	8 Mar 2003 14:12:58 -0000	1.71
+++ actor.cpp	24 Mar 2003 21:56:29 -0000	1.72
@@ -1112,10 +1112,8 @@
 	if (_fullRedraw) {
 		for (j = 1; j < NUM_ACTORS; j++) {
 			Actor *a = derefActor(j);
-			if (fg)
-				a->needRedraw = true;
-			if (bg)
-				a->needBgReset = true;
+			a->needRedraw |= fg;
+			a->needBgReset |= bg;
 		}
 	} else {
 		for (i = 0; i < gdi._numStrips; i++) {
@@ -1125,10 +1123,8 @@
 					if (testGfxUsageBit(strip, j) && testGfxOtherUsageBits(strip, j)) {
 						Actor *a = derefActor(j);
 						assert(a->number == j);
-						if (fg)
-							a->needRedraw = true;
-						if (bg)
-							a->needBgReset = true;
+						a->needRedraw |= fg;
+						a->needBgReset |= bg;
 					}
 				}
 			}





More information about the Scummvm-git-logs mailing list