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/adlibchannel.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/adlibchannel.cpp')
| -rw-r--r-- | sky/music/adlibchannel.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sky/music/adlibchannel.cpp b/sky/music/adlibchannel.cpp index a5215ca2b5..4e68c4458f 100644 --- a/sky/music/adlibchannel.cpp +++ b/sky/music/adlibchannel.cpp @@ -19,8 +19,9 @@ * */ -#include "adlibchannel.h" -#include "sound/fmopl.h" +#include "common/util.h" +#include "sky/music/adlibchannel.h" +#include "sky/sky.h" SkyAdlibChannel::SkyAdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfData) { @@ -42,7 +43,7 @@ SkyAdlibChannel::SkyAdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfD uint16 instrumentDataLoc; - if (SkyState::_systemVars.gameVersion == 109) { + if (SkyEngine::_systemVars.gameVersion == 109) { //instrumentDataLoc = (_musicData[0x11D0] << 8) | _musicData[0x11CF]; //_frequenceTable = (uint16*)(_musicData + 0x835); //_registerTable = _musicData + 0xE35; @@ -54,7 +55,7 @@ SkyAdlibChannel::SkyAdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfD _registerTable = _musicData + 0xE68; _opOutputTable = _musicData + 0xE7A; _adlibRegMirror = _musicData + 0xF7D; - } else if (SkyState::_systemVars.gameVersion == 267) { + } else if (SkyEngine::_systemVars.gameVersion == 267) { instrumentDataLoc = READ_LE_UINT16(_musicData + 0x11FB); _frequenceTable = (uint16*)(_musicData + 0x7F4); _registerTable = _musicData + 0xDF4; |