[Scummvm-cvs-logs] SF.net SVN: scummvm: [25606] scummvm/trunk/engines/scumm/camera.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Thu Feb 15 14:27:37 CET 2007


Revision: 25606
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25606&view=rev
Author:   fingolfin
Date:     2007-02-15 05:27:36 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/camera.cpp

Modified: scummvm/trunk/engines/scumm/camera.cpp
===================================================================
--- scummvm/trunk/engines/scumm/camera.cpp	2007-02-15 12:47:09 UTC (rev 25605)
+++ scummvm/trunk/engines/scumm/camera.cpp	2007-02-15 13:27:36 UTC (rev 25606)
@@ -103,11 +103,12 @@
 	int pos = camera._cur.x;
 	int t;
 	Actor *a = NULL;
+	const bool snapToX = (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X));
 
 	camera._cur.x &= 0xFFF8;
 
 	if (VAR_CAMERA_MIN_X != 0xFF && camera._cur.x < VAR(VAR_CAMERA_MIN_X)) {
-		if (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X))
+		if (snapToX)
 			camera._cur.x = (short) VAR(VAR_CAMERA_MIN_X);
 		else
 			camera._cur.x += 8;
@@ -116,7 +117,7 @@
 	}
 
 	if (VAR_CAMERA_MAX_X != 0xFF && camera._cur.x > VAR(VAR_CAMERA_MAX_X)) {
-		if (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X))
+		if (snapToX)
 			camera._cur.x = (short) VAR(VAR_CAMERA_MAX_X);
 		else
 			camera._cur.x -= 8;
@@ -131,8 +132,8 @@
 		t = actorx / 8 - _screenStartStrip;
 
 		if (t < camera._leftTrigger || t > camera._rightTrigger) {
-			if (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X)) {
-				if (t > 35)
+			if (snapToX) {
+				if (t > 40-5)
 					camera._dest.x = actorx + 80;
 				if (t < 5)
 					camera._dest.x = actorx - 80;
@@ -152,7 +153,7 @@
 	if (VAR_CAMERA_MAX_X != 0xFF && camera._dest.x > VAR(VAR_CAMERA_MAX_X))
 		camera._dest.x = (short) VAR(VAR_CAMERA_MAX_X);
 
-	if (VAR_CAMERA_FAST_X != 0xFF && VAR(VAR_CAMERA_FAST_X)) {
+	if (snapToX) {
 		camera._cur.x = camera._dest.x;
 	} else {
 		if (camera._cur.x < camera._dest.x)
@@ -161,7 +162,7 @@
 			camera._cur.x -= 8;
 	}
 
-	/* a is set a bit above */
+	/* Actor 'a' is set a bit above */
 	if (camera._movingToActor && (camera._cur.x / 8) == (a->getPos().x / 8)) {
 		camera._movingToActor = false;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list