[Scummvm-cvs-logs] SF.net SVN: scummvm:[55662] scummvm/trunk/engines/toon

[sylvaintv at users.sourceforge.net]

Revision: 55662
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55662&view=rev
Author:   sylvaintv
Date:     2011-01-30 20:21:45 +0000 (Sun, 30 Jan 2011)

Log Message:
-----------
TOON: Fixes two movie issues

- Can't skip the videos with left button anymore, now the Nefarius video on the
TV is played normally and not skipped.
- Last video playback 2x too big in height.

Modified Paths:
--------------
    scummvm/trunk/engines/toon/movie.cpp
    scummvm/trunk/engines/toon/script_func.cpp

Modified: scummvm/trunk/engines/toon/movie.cpp
===================================================================
--- scummvm/trunk/engines/toon/movie.cpp	2011-01-30 17:28:35 UTC (rev 55661)
+++ scummvm/trunk/engines/toon/movie.cpp	2011-01-30 20:21:45 UTC (rev 55662)
@@ -44,7 +44,7 @@
 	_lowRes = false;
 
 	if (Video::SmackerDecoder::loadFile(filename)) {
-		if (forcedflags & 0x10 || _surface->h == 200) {
+		if (_surface->h == 200) {
 			if (_surface) {
 				_surface->free();
 				delete _surface;
@@ -119,7 +119,7 @@
 
 		Common::Event event;
 		while (_vm->getSystem()->getEventManager()->pollEvent(event))
-			if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || event.type == Common::EVENT_LBUTTONUP) {
+			if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE)) {
 				return false;
 			}
 

Modified: scummvm/trunk/engines/toon/script_func.cpp
===================================================================
--- scummvm/trunk/engines/toon/script_func.cpp	2011-01-30 17:28:35 UTC (rev 55661)
+++ scummvm/trunk/engines/toon/script_func.cpp	2011-01-30 20:21:45 UTC (rev 55662)
@@ -321,8 +321,6 @@
 	else
 		strcpy(name, _vm->createRoomFilename(GetText(0, state)).c_str());
 
-// Strangerke - Commented (not used)
-//	int32 Flags = stackPos(1);
 	int32 stopMusic = stackPos(2);
 	_vm->getMoviePlayer()->play(name, stopMusic);
 	return 0;


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