diff options
| author | Filippos Karapetis | 2008-04-21 18:40:28 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-04-21 18:40:28 +0000 |
| commit | 36bec1d5c8f3eb6f299817692558bd2d33ec7d9a (patch) | |
| tree | 52d9b6ccc0b978ca74d66ca6a8e2e17cf92cfb2f /engines/made/pmvplayer.h | |
| parent | 008c4ca9d667bbe1c11349ef06b7c3595b05cf40 (diff) | |
| download | scummvm-rg350-36bec1d5c8f3eb6f299817692558bd2d33ec7d9a.tar.gz scummvm-rg350-36bec1d5c8f3eb6f299817692558bd2d33ec7d9a.tar.bz2 scummvm-rg350-36bec1d5c8f3eb6f299817692558bd2d33ec7d9a.zip | |
Code merge
svn-id: r31648
Diffstat (limited to 'engines/made/pmvplayer.h')
| -rw-r--r-- | engines/made/pmvplayer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/made/pmvplayer.h b/engines/made/pmvplayer.h index 117817ed93..0e63d73f7f 100644 --- a/engines/made/pmvplayer.h +++ b/engines/made/pmvplayer.h @@ -36,16 +36,17 @@ #include "made/graphics.h" #include "made/sound.h" +#include "made/made.h" namespace Made { class PmvPlayer { public: - PmvPlayer(OSystem *system, Audio::Mixer *mixer); + PmvPlayer(MadeEngine *vm, Audio::Mixer *mixer); ~PmvPlayer(); void play(const char *filename); protected: - OSystem *_system; + MadeEngine *_vm; Audio::Mixer *_mixer; Common::File *_fd; Audio::AppendableAudioStream *_audioStream; @@ -55,7 +56,6 @@ protected: bool _abort; void readChunk(uint32 &chunkType, uint32 &chunkSize); void handleEvents(); - void updatePalette(); void updateScreen(); void decompressPalette(byte *palData, byte *outPal, uint32 palDataSize); }; |