Mirror last Smacker changes.

svn-id: r35383

2 files changed, 8 insertions, 12 deletions

diff --git a/graphics/dxa_player.cpp b/graphics/dxa_player.cpp
index b0c3f498d7..39c966a258 100644
--- a/graphics/dxa_player.cpp
+++ b/graphics/dxa_player.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "common/endian.h"
-#include "common/file.h"
+#include "common/archive.h"
 #include "graphics/dxa_player.h"
 #include "common/util.h"
 
@@ -89,17 +89,13 @@ int DXAPlayer::getFrameCount() {
 	return _framesCount;
 }
 
-bool DXAPlayer::loadFile(const char *filename) {
+bool DXAPlayer::loadFile(const char *fileName) {
 	uint32 tag;
 	int32 frameRate;
 
-	Common::File *file = new Common::File();
-	if (!file->open(filename)) {
-		delete file;
-		return 0;
-	}
-
-	_fileStream = file;
+	_fileStream = SearchMan.openFile(fileName);
+	if (!_fileStream)
+		return false;
 
 	tag = _fileStream->readUint32BE();
 	assert(tag == MKID_BE('DEXA'));
diff --git a/graphics/dxa_player.h b/graphics/dxa_player.h
index 27f4752d6a..4eec9d93bf 100644
--- a/graphics/dxa_player.h
+++ b/graphics/dxa_player.h
@@ -61,8 +61,6 @@ public:
 	DXAPlayer();
 	virtual ~DXAPlayer();
 
-	Common::SeekableReadStream *_fileStream;
-
 	/**
 	 * Returns the width of the video
 	 * @return the width of the video
@@ -91,7 +89,7 @@ public:
 	 * Load a DXA encoded video file
 	 * @param filename	the filename to load
 	 */
-	bool loadFile(const char *filename);
+	bool loadFile(const char *fileName);
 
 	/**
 	 * Close a DXA encoded video file
@@ -123,6 +121,8 @@ protected:
 	void decodeZlib(byte *data, int size, int totalSize);
 	void decode12(int size);
 	void decode13(int size);
+
+	Common::SeekableReadStream *_fileStream;
 };
 
 } // End of namespace Graphics