[Scummvm-cvs-logs] SF.net SVN: scummvm: [27249] scummvm/branches/branch-0-10-0/engines/gob/ mult_v2.cpp

[drmccoy at users.sourceforge.net]

Revision: 27249
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27249&view=rev
Author:   drmccoy
Date:     2007-06-09 06:32:34 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
Fixing scrolling issue in "IDOL"-screen (bug #1734007)

Modified Paths:
--------------
    scummvm/branches/branch-0-10-0/engines/gob/mult_v2.cpp

Modified: scummvm/branches/branch-0-10-0/engines/gob/mult_v2.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/gob/mult_v2.cpp	2007-06-09 13:32:31 UTC (rev 27248)
+++ scummvm/branches/branch-0-10-0/engines/gob/mult_v2.cpp	2007-06-09 13:32:34 UTC (rev 27249)
@@ -1044,12 +1044,15 @@
 	if ((palFrame != -1) && (lastFrame != -1))
 		if ((lastFrame - palFrame) < startFrame)
 			if (!(key.flags & 0x4000)) {
+				_vm->_game->_preventScroll = false;
 				_vm->_imdPlayer->closeImd();
 				return;
 			}
 
-	if (!_vm->_imdPlayer->openImd(imdFile, x, y, 0, flags))
+	if (!_vm->_imdPlayer->openImd(imdFile, x, y, 0, flags)) {
+		_vm->_game->_preventScroll = false;
 		return;
+	}
 
 	if (palFrame == -1)
 		palFrame = 0;
@@ -1064,6 +1067,7 @@
 void Mult_v2::advanceObjects(int16 index) {
 	int16 frame;
 	bool stop = false;
+	bool hasImds = false;
 	
 	frame = _multData->animKeysFrames[index];
 	if (frame == -1)
@@ -1165,10 +1169,14 @@
 			if ((dir != 1) && (--startFrame > 0))
 				startFrame = 0;
 
+			hasImds = true;
 			playImd(imdFile, key, dir, startFrame);
 		}
 	}
 	
+	if (!hasImds && (_vm->_draw->_showCursor == 3))
+		_vm->_game->_preventScroll = false;
+
 	doSoundAnim(stop, frame);
 	WRITE_VAR(22, frame);
 


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