diff options
author | Max Horn | 2004-01-19 19:34:48 +0000 |
---|---|---|
committer | Max Horn | 2004-01-19 19:34:48 +0000 |
commit | d094989ae24bfba1cbff2f7a230d3b68e51c68bb (patch) | |
tree | 12a83a2889b91c0a1a37abd664473241e3561cb3 /scumm/smush | |
parent | 4ad9da8b757aba2e6c1b53430a1f539be306b62c (diff) | |
download | scummvm-rg350-d094989ae24bfba1cbff2f7a230d3b68e51c68bb.tar.gz scummvm-rg350-d094989ae24bfba1cbff2f7a230d3b68e51c68bb.tar.bz2 scummvm-rg350-d094989ae24bfba1cbff2f7a230d3b68e51c68bb.zip |
smush and insane only work with V6 (this will allow moving some stuff from ScummEngine to ScummEngine_v6)
svn-id: r12516
Diffstat (limited to 'scumm/smush')
-rw-r--r-- | scumm/smush/smush_player.cpp | 2 | ||||
-rw-r--r-- | scumm/smush/smush_player.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 82600c40d8..d3613d56aa 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -211,7 +211,7 @@ void SmushPlayer::timerCallback(void *refCon) { ((SmushPlayer *)refCon)->parseNextFrame(); } -SmushPlayer::SmushPlayer(ScummEngine *scumm, int speed) { +SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) { _vm = scumm; _version = -1; _nbframes = 0; diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h index 0dd25270ff..dcc592c84a 100644 --- a/scumm/smush/smush_player.h +++ b/scumm/smush/smush_player.h @@ -30,6 +30,7 @@ namespace Scumm { +class ScummEngine_v6; class SmushFont; class SmushMixer; class StringResource; @@ -37,7 +38,7 @@ class StringResource; class SmushPlayer { friend class Insane; private: - ScummEngine *_vm; + ScummEngine_v6 *_vm; int _version; int32 _nbframes; SmushMixer *_smixer; @@ -71,7 +72,7 @@ private: bool _middleAudio; public: - SmushPlayer(ScummEngine *scumm, int speed); + SmushPlayer(ScummEngine_v6 *scumm, int speed); ~SmushPlayer(); void play(const char *filename, const char *directory); |