diff options
| author | Max Horn | 2003-10-05 20:21:20 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-05 20:21:20 +0000 |
| commit | bfce5e500aa09d36b974c29acf91780e0b26b459 (patch) | |
| tree | 4d750dac946597e0291a306fe649aeb374f79185 /sky/music/gmmusic.cpp | |
| parent | 9f537f4b8cbb282af717a66d3912ad51602e174f (diff) | |
| download | scummvm-rg350-bfce5e500aa09d36b974c29acf91780e0b26b459.tar.gz scummvm-rg350-bfce5e500aa09d36b974c29acf91780e0b26b459.tar.bz2 scummvm-rg350-bfce5e500aa09d36b974c29acf91780e0b26b459.zip | |
renamed SkyState to SkyEngine; cleaned the #include dependency mess a bit (try to only #include files when you *have* to -> this reduces compilation time to a minimum when header file changes are made)
svn-id: r10622
Diffstat (limited to 'sky/music/gmmusic.cpp')
| -rw-r--r-- | sky/music/gmmusic.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sky/music/gmmusic.cpp b/sky/music/gmmusic.cpp index 581ebd841e..4bdef54e46 100644 --- a/sky/music/gmmusic.cpp +++ b/sky/music/gmmusic.cpp @@ -20,7 +20,10 @@ */ #include "sky/music/gmmusic.h" +#include "sky/music/gmchannel.h" #include "sky/sky.h" +#include "common/util.h" +#include "sound/mididrv.h" void SkyGmMusic::passTimerFunc(void *param) { @@ -34,7 +37,7 @@ SkyGmMusic::SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system) _midiDrv = pMidiDrv; int midiRes = _midiDrv->open(); if (midiRes != 0) { - error("Can't open midi device. Errorcode: %d",midiRes); + error("Can't open midi device. Errorcode: %d", midiRes); } _midiDrv->setTimerCallback(this, passTimerFunc); _ignoreNextPoll = false; @@ -73,7 +76,7 @@ void SkyGmMusic::timerCall(void) { void SkyGmMusic::setupPointers(void) { - if (SkyState::_systemVars.gameVersion == 109) { + if (SkyEngine::_systemVars.gameVersion == 109) { _musicDataLoc = (_musicData[0x79C] << 8) | _musicData[0x79B]; _sysExSequence = _musicData + 0x1EF2; } else { |