diff options
author | Max Horn | 2008-12-15 12:55:57 +0000 |
---|---|---|
committer | Max Horn | 2008-12-15 12:55:57 +0000 |
commit | 319795565e482012f56aa5fad5b9f6d35835ecb5 (patch) | |
tree | e90ba2b7e95ef400fe30785ade27eb159d94b567 /graphics/smk_player.cpp | |
parent | ea3d4fe22d30e4f3c089a9593be501ba2b4bc7fa (diff) | |
download | scummvm-rg350-319795565e482012f56aa5fad5b9f6d35835ecb5.tar.gz scummvm-rg350-319795565e482012f56aa5fad5b9f6d35835ecb5.tar.bz2 scummvm-rg350-319795565e482012f56aa5fad5b9f6d35835ecb5.zip |
SMK player: do not include headers that are not needed, do not expose internal _fileStream for no apparent reason
svn-id: r35382
Diffstat (limited to 'graphics/smk_player.cpp')
-rw-r--r-- | graphics/smk_player.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/graphics/smk_player.cpp b/graphics/smk_player.cpp index ef206e12d7..e980e0abed 100644 --- a/graphics/smk_player.cpp +++ b/graphics/smk_player.cpp @@ -28,7 +28,7 @@ // http://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/smacker.c?revision=15884&view=markup #include "graphics/smk_player.h" -#include "common/file.h" +#include "common/archive.h" #include "common/system.h" #include "common/util.h" #include "common/array.h" @@ -312,7 +312,7 @@ uint32 BigHuffmanTree::getCode(BitStream &bs) { } SMKPlayer::SMKPlayer() - : _currentSMKFrame(0),_fileStream(0) { + : _currentSMKFrame(0), _fileStream(0) { } SMKPlayer::~SMKPlayer() { @@ -352,13 +352,9 @@ int32 SMKPlayer::getFrameRate() { bool SMKPlayer::loadFile(const char *fileName) { closeFile(); - Common::File *file = new Common::File(); - if (!file->open(fileName)) { - delete file; + _fileStream = SearchMan.openFile(fileName); + if (!_fileStream) return false; - } - - _fileStream = file; // Seek to the first frame _currentSMKFrame = 0; |