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

[kirben at users.sourceforge.net]

Revision: 20906
Author:   kirben
Date:     2006-02-25 22:15:13 -0800 (Sat, 25 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20906&view=rev

Log Message:
-----------
Camera variables are initialised on startup by COMI too

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-02-26 05:48:40 UTC (rev 20905)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-02-26 06:15:13 UTC (rev 20906)
@@ -1391,12 +1391,12 @@
 		_verbs[i].key = 0;
 	}
 
-	if (_game.version == 7) {
+	if (_game.features & GF_NEW_CAMERA) {
 		VAR(VAR_CAMERA_THRESHOLD_X) = 100;
 		VAR(VAR_CAMERA_THRESHOLD_Y) = 70;
 		VAR(VAR_CAMERA_ACCEL_X) = 100;
 		VAR(VAR_CAMERA_ACCEL_Y) = 100;
-	} else if (!(_game.features & GF_NEW_CAMERA)) {
+	} else {
 		if (_game.platform == Common::kPlatformNES) {
 			camera._leftTrigger = 6;	// 6
 			camera._rightTrigger = 21;	// 25