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

[Kirben at users.sourceforge.net]

Revision: 39285
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39285&view=rev
Author:   Kirben
Date:     2009-03-10 00:36:56 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
Alter/revert last changes to moveCamera(), as VAR_CAMERA_FAST_X is used by a few scripts in Indy3 too.

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

Modified: scummvm/trunk/engines/scumm/camera.cpp
===================================================================
--- scummvm/trunk/engines/scumm/camera.cpp	2009-03-10 00:32:20 UTC (rev 39284)
+++ scummvm/trunk/engines/scumm/camera.cpp	2009-03-10 00:36:56 UTC (rev 39285)
@@ -105,11 +105,12 @@
 	int pos = camera._cur.x;
 	int t;
 	Actor *a = NULL;
+	const bool snapToX = (_snapScroll || (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 (_snapScroll)
+		if (snapToX)
 			camera._cur.x = (short) VAR(VAR_CAMERA_MIN_X);
 		else
 			camera._cur.x += 8;
@@ -118,7 +119,7 @@
 	}
 
 	if (VAR_CAMERA_MAX_X != 0xFF && camera._cur.x > VAR(VAR_CAMERA_MAX_X)) {
-		if (_snapScroll)
+		if (snapToX)
 			camera._cur.x = (short) VAR(VAR_CAMERA_MAX_X);
 		else
 			camera._cur.x -= 8;
@@ -133,7 +134,7 @@
 		t = actorx / 8 - _screenStartStrip;
 
 		if (t < camera._leftTrigger || t > camera._rightTrigger) {
-			if (_snapScroll) {
+			if (snapToX) {
 				if (t > 40-5)
 					camera._dest.x = actorx + 80;
 				if (t < 5)
@@ -154,7 +155,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 (_snapScroll) {
+	if (snapToX) {
 		camera._cur.x = camera._dest.x;
 	} else {
 		if (camera._cur.x < camera._dest.x)

Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp	2009-03-10 00:32:20 UTC (rev 39284)
+++ scummvm/trunk/engines/scumm/input.cpp	2009-03-10 00:36:56 UTC (rev 39285)
@@ -487,9 +487,8 @@
 		abortCutscene();
 
 		// VAR_CUTSCENEEXIT_KEY doesn't exist in SCUMM0
-		if (VAR_CUTSCENEEXIT_KEY != 0xFF) {
+		if (VAR_CUTSCENEEXIT_KEY != 0xFF)
 			_mouseAndKeyboardStat = VAR(VAR_CUTSCENEEXIT_KEY);
-		}
 	} else if (snapScrollKeyEnabled && lastKeyHit.keycode == Common::KEYCODE_r &&
 		lastKeyHit.flags == Common::KBD_CTRL) {
 		_snapScroll ^= 1;


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