[Scummvm-cvs-logs] scummvm master -> a6b65b84b040293e1bc6ed24a3ccdf5fde169bec

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a6b65b84b0 SCUMM - Fix bug #3536645, FT Missing Dialogue Line


Commit: a6b65b84b040293e1bc6ed24a3ccdf5fde169bec
    https://github.com/scummvm/scummvm/commit/a6b65b84b040293e1bc6ed24a3ccdf5fde169bec
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2012-06-23T10:30:10-07:00

Commit Message:
SCUMM - Fix bug #3536645, FT Missing Dialogue Line

The condition for setting up the scene when encountering Father
Torque had been accidentally inverted, so the function was called
over and over (presumably causing the scene to stall), insead of
just once. I don't know much about INSANE, but sev has confirmed
that this is the correct fix.

Changed paths:
    engines/scumm/insane/insane_scenes.cpp



diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp
index 6db1cb5..db0b017 100644
--- a/engines/scumm/insane/insane_scenes.cpp
+++ b/engines/scumm/insane/insane_scenes.cpp
@@ -1386,7 +1386,7 @@ void Insane::postCase12(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 			break;
 		case EN_TORQUE:
 			turnBen(false);
-			if (_actor[1].y != 300)
+			if (_actor[1].y == 300)
 				prepareScenePropScene(57, 1, 0);
 			break;
 		default: