[Scummvm-cvs-logs] SF.net SVN: scummvm: [29350] scummvm/trunk/engines/agos

[Kirben at users.sourceforge.net]

Revision: 29350
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29350&view=rev
Author:   Kirben
Date:     2007-10-31 19:10:55 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Fix play back of OmniTV videos in The Feeble Files for now.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/animation.cpp
    scummvm/trunk/engines/agos/animation.h

Modified: scummvm/trunk/engines/agos/animation.cpp
===================================================================
--- scummvm/trunk/engines/agos/animation.cpp	2007-11-01 00:33:12 UTC (rev 29349)
+++ scummvm/trunk/engines/agos/animation.cpp	2007-11-01 02:10:55 UTC (rev 29350)
@@ -44,6 +44,7 @@
 MoviePlayer::MoviePlayer(AGOSEngine *vm, Audio::Mixer *mixer)
 	: DXAPlayer(), _vm(vm), _mixer(mixer) {
 	_omniTV = false;
+	_omniTVLoad = false;
 
 	_omniTVFile = 0;
 
@@ -67,7 +68,15 @@
 	// Change file extension to dxa
 	sprintf(videoName, "%s.dxa", baseName);
 
-	if (!loadFile(videoName, _vm->_screenWidth, _vm->_screenHeight)) {
+	uint16 dstWidth = _vm->_screenWidth;
+	uint16 dstHeight = _vm->_screenHeight;
+	if (_omniTVLoad) {
+		dstWidth = 56;
+		dstHeight = 104;
+		_omniTVLoad = false;
+	}
+
+	if (!loadFile(videoName, dstWidth, dstHeight)) {
 		// Check short filename to work around
 		// bug in a German Windows 2CD version.
 		if (baseLen >= 8) {
@@ -120,6 +129,7 @@
 			_omniTV = true;
 		} else {
 			_vm->_variableArray[254] = 6747;
+			_omniTVLoad = true;
 		}
 	}
 }
@@ -248,6 +258,7 @@
 		_omniTVFile = 0;
 		closeFile();
 		_vm->_variableArray[254] = 6747;
+		_omniTVLoad = true;
 	}
 }
 

Modified: scummvm/trunk/engines/agos/animation.h
===================================================================
--- scummvm/trunk/engines/agos/animation.h	2007-11-01 00:33:12 UTC (rev 29349)
+++ scummvm/trunk/engines/agos/animation.h	2007-11-01 02:10:55 UTC (rev 29350)
@@ -47,7 +47,7 @@
 	Audio::SoundHandle _omniTVSound;
 	Common::SeekableReadStream *_omniTVFile;
 
-	bool _omniTV;
+	bool _omniTV, _omniTVLoad;
 	bool _leftButtonDown;
 	bool _rightButtonDown;
 	uint32 _ticks;


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