diff options
author | David Corrales | 2007-08-05 19:34:20 +0000 |
---|---|---|
committer | David Corrales | 2007-08-05 19:34:20 +0000 |
commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/kyra/seqplayer.h | |
parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/kyra/seqplayer.h')
-rw-r--r-- | engines/kyra/seqplayer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/kyra/seqplayer.h b/engines/kyra/seqplayer.h index 0fba0403e4..4636a956e9 100644 --- a/engines/kyra/seqplayer.h +++ b/engines/kyra/seqplayer.h @@ -26,11 +26,13 @@ #ifndef KYRA_SEQPLAYER_H #define KYRA_SEQPLAYER_H +#include "kyra/kyra_v1.h" + namespace Kyra { class SeqPlayer { public: - SeqPlayer(KyraEngine* vm, OSystem* system); + SeqPlayer(KyraEngine_v1 *vm, OSystem *system); ~SeqPlayer(); void setCopyViewOffs(bool offs) { @@ -43,9 +45,8 @@ public: bool playSequence(const uint8 *seqData, bool skipSeq); uint8 *setPanPages(int pageNum, int shape); - protected: - KyraEngine *_vm; + KyraEngine_v1 *_vm; OSystem *_system; Screen *_screen; Sound *_sound; |