[Scummvm-cvs-logs] SF.net SVN: scummvm:[47225] scummvm/trunk/engines/sci/graphics/portrait.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 47225
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47225&view=rev
Author:   m_kiewitz
Date:     2010-01-10 13:22:45 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
SCI: kPortrait - abort on mouse presses only

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/portrait.cpp

Modified: scummvm/trunk/engines/sci/graphics/portrait.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/portrait.cpp	2010-01-10 13:11:53 UTC (rev 47224)
+++ scummvm/trunk/engines/sci/graphics/portrait.cpp	2010-01-10 13:22:45 UTC (rev 47225)
@@ -172,8 +172,10 @@
 		do {
 			_gui->wait(1);
 			curEvent = _event->get(SCI_EVENT_ANY);
+			if (curEvent.type == SCI_EVENT_MOUSE_PRESS)
+				userAbort = true;
 			curPosition = _audio->getAudioPosition();
-		} while ((curPosition != -1) && (curPosition < timerPosition) && (curEvent.type == SCI_EVENT_NONE));
+		} while ((curPosition != -1) && (curPosition < timerPosition) && (!userAbort));
 
 		if (syncCue != 0xFFFF) {
 			// Display animation bitmap
@@ -186,12 +188,6 @@
 				warning("kPortrait: sync information tried to draw non-existant %d", syncCue);
 			}
 		}
-
-		switch (curEvent.type) {
-		case SCI_EVENT_MOUSE_RELEASE:
-		case SCI_EVENT_MOUSE_PRESS:
-			userAbort = true;
-		}
 	}
 
 	if (userAbort)


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