diff options
| author | Max Horn | 2006-10-07 13:57:06 +0000 |
|---|---|---|
| committer | Max Horn | 2006-10-07 13:57:06 +0000 |
| commit | 4973c657b81344409544dd340cf498e6a745b2b7 (patch) | |
| tree | a09bdf1e3fb1a2aa8c86ef687a14bc5603fccc95 /engines/scumm/imuse_digi | |
| parent | f6407f01f88633266b92b2f8950a072e49b2a17c (diff) | |
| download | scummvm-rg350-4973c657b81344409544dd340cf498e6a745b2b7.tar.gz scummvm-rg350-4973c657b81344409544dd340cf498e6a745b2b7.tar.bz2 scummvm-rg350-4973c657b81344409544dd340cf498e6a745b2b7.zip | |
Moved all INSANE and SMUSH related code into ScummEngine_v7 (resp. ScummEngine_v6 in a few cases)
svn-id: r24169
Diffstat (limited to 'engines/scumm/imuse_digi')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse.h | 5 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_script.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_track.cpp | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index 761f5dff55..537faad92a 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/engines/scumm/imuse_digi/dimuse.cpp @@ -25,7 +25,7 @@ #include "scumm/actor.h" #include "scumm/saveload.h" -#include "scumm/scumm.h" +#include "scumm/intern.h" #include "scumm/sound.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/imuse_digi/dimuse_bndmgr.h" @@ -44,7 +44,7 @@ void IMuseDigital::timer_handler(void *refCon) { imuseDigital->callback(); } -IMuseDigital::IMuseDigital(ScummEngine *scumm, int fps) +IMuseDigital::IMuseDigital(ScummEngine_v7 *scumm, int fps) : _vm(scumm) { _pause = false; _sound = new ImuseDigiSndMgr(_vm); diff --git a/engines/scumm/imuse_digi/dimuse.h b/engines/scumm/imuse_digi/dimuse.h index d94ad8d52d..0a3ed5b2f5 100644 --- a/engines/scumm/imuse_digi/dimuse.h +++ b/engines/scumm/imuse_digi/dimuse.h @@ -42,6 +42,7 @@ namespace Scumm { struct imuseDigTable; struct imuseComiTable; class Serializer; +class ScummEngine_v7; class IMuseDigital : public MusicEngine { private: @@ -88,7 +89,7 @@ private: Track *_track[MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS]; Common::Mutex _mutex; - ScummEngine *_vm; + ScummEngine_v7 *_vm; ImuseDigiSndMgr *_sound; char *_audioNames; @@ -130,7 +131,7 @@ private: void playDigMusic(const char *songName, const imuseDigTable *table, int atribPos, bool sequence); public: - IMuseDigital(ScummEngine *scumm, int fps); + IMuseDigital(ScummEngine_v7 *scumm, int fps); virtual ~IMuseDigital(); void setAudioNames(int32 num, char *names); diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp index 69bbac57c5..b55855262d 100644 --- a/engines/scumm/imuse_digi/dimuse_script.cpp +++ b/engines/scumm/imuse_digi/dimuse_script.cpp @@ -24,7 +24,7 @@ #include "common/timer.h" #include "scumm/actor.h" -#include "scumm/scumm.h" +#include "scumm/intern.h" #include "scumm/sound.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/imuse_digi/dimuse_bndmgr.h" diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index d9baa00c6e..eb17887a0b 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -23,7 +23,7 @@ #include "common/timer.h" #include "scumm/actor.h" -#include "scumm/scumm.h" +#include "scumm/intern.h" #include "scumm/sound.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/imuse_digi/dimuse_bndmgr.h" |