Revert patch #1709219 - DXA Player: double size scaling option.

svn-id: r29351

4 files changed, 4 insertions, 17 deletions

diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index 7c80971396..fd78c65002 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -44,7 +44,6 @@ namespace AGOS {
 MoviePlayer::MoviePlayer(AGOSEngine *vm, Audio::Mixer *mixer)
 	: DXAPlayer(), _vm(vm), _mixer(mixer) {
 	_omniTV = false;
-	_omniTVLoad = false;
 
 	_omniTVFile = 0;
 
@@ -68,15 +67,7 @@ bool MoviePlayer::load(const char *filename) {
 	// Change file extension to dxa
 	sprintf(videoName, "%s.dxa", baseName);
 
-	uint16 dstWidth = _vm->_screenWidth;
-	uint16 dstHeight = _vm->_screenHeight;
-	if (_omniTVLoad) {
-		dstWidth = 56;
-		dstHeight = 104;
-		_omniTVLoad = false;
-	}
-
-	if (!loadFile(videoName, dstWidth, dstHeight)) {
+	if (!loadFile(videoName)) {
 		// Check short filename to work around
 		// bug in a German Windows 2CD version.
 		if (baseLen >= 8) {
@@ -129,7 +120,6 @@ void MoviePlayer::playOmniTV() {
 			_omniTV = true;
 		} else {
 			_vm->_variableArray[254] = 6747;
-			_omniTVLoad = true;
 		}
 	}
 }
@@ -258,7 +248,6 @@ void MoviePlayer::nextFrame() {
 		_omniTVFile = 0;
 		closeFile();
 		_vm->_variableArray[254] = 6747;
-		_omniTVLoad = true;
 	}
 }
 
diff --git a/engines/agos/animation.h b/engines/agos/animation.h
index db325b336a..6776395ab7 100644
--- a/engines/agos/animation.h
+++ b/engines/agos/animation.h
@@ -47,7 +47,7 @@ class MoviePlayer : public Graphics::DXAPlayer {
 	Audio::SoundHandle _omniTVSound;
 	Common::SeekableReadStream *_omniTVFile;
 
-	bool _omniTV, _omniTVLoad;
+	bool _omniTV;
 	bool _leftButtonDown;
 	bool _rightButtonDown;
 	uint32 _ticks;
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 1062ce6029..2bb027ddb4 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -408,7 +408,7 @@ bool MoviePlayerDXA::load(uint32 id) {
 
 	char filename[20];
 	snprintf(filename, sizeof(filename), "%s.dxa", sequenceList[id]);
-	if (loadFile(filename, 640, 480)) {
+	if (loadFile(filename)) {
 		// The Broken Sword games always use external audio tracks.
 		if (_fd->readUint32BE() != MKID_BE('NULL'))
 			return false;
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index 5e12f262cd..082d02a88f 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -516,9 +516,7 @@ bool MoviePlayerDXA::load() {
 
 	snprintf(filename, sizeof(filename), "%s.dxa", _name);
 
-	if (loadFile(filename,
-			_vm->_screen->getScreenWide(),
-			_vm->_screen->getScreenDeep())) {
+	if (loadFile(filename)) {
 		// The Broken Sword games always use external audio tracks.
 		if (_fd->readUint32BE() != MKID_BE('NULL'))
 			return false;