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/adlibmusic.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/adlibmusic.cpp')
| -rw-r--r-- | sky/music/adlibmusic.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp index d3916269bd..d8f80d772a 100644 --- a/sky/music/adlibmusic.cpp +++ b/sky/music/adlibmusic.cpp @@ -20,7 +20,9 @@ */ #include "sky/music/adlibmusic.h" -#include "sound/fmopl.h" +#include "sky/music/adlibchannel.h" +#include "sound/mixer.h" +#include "sky/sky.h" void SkyAdlibMusic::passMixerFunc(void *param, int16 *buf, uint len) { @@ -91,14 +93,14 @@ void SkyAdlibMusic::premixerCall(int16 *data, uint len) { void SkyAdlibMusic::setupPointers(void) { - if (SkyState::_systemVars.gameVersion == 109) { + if (SkyEngine::_systemVars.gameVersion == 109) { // disk demo uses a different adlib driver version, some offsets have changed //_musicDataLoc = (_musicData[0x11CC] << 8) | _musicData[0x11CB]; //_initSequence = _musicData + 0xEC8; _musicDataLoc = READ_LE_UINT16(_musicData + 0x1200); _initSequence = _musicData + 0xEFB; - } else if (SkyState::_systemVars.gameVersion == 267) { + } else if (SkyEngine::_systemVars.gameVersion == 267) { _musicDataLoc = READ_LE_UINT16(_musicData + 0x11F7); _initSequence = _musicData + 0xE87; } else { |