diff options
author | Johannes Schickel | 2007-04-01 13:10:50 +0000 |
---|---|---|
committer | Johannes Schickel | 2007-04-01 13:10:50 +0000 |
commit | 397c10f059308f575ea75ea767c87148a7406f33 (patch) | |
tree | 6853ed5dca76f46ad6e907aa9bdf5c2fe95c0c8c /engines/kyra/sound_towns.cpp | |
parent | b7e499b64a1b1dc88c375a6151b7789d1970f4d5 (diff) | |
download | scummvm-rg350-397c10f059308f575ea75ea767c87148a7406f33.tar.gz scummvm-rg350-397c10f059308f575ea75ea767c87148a7406f33.tar.bz2 scummvm-rg350-397c10f059308f575ea75ea767c87148a7406f33.zip |
made _vm/_engine usage consistent. (_engine -> _vm all over the place now).
svn-id: r26342
Diffstat (limited to 'engines/kyra/sound_towns.cpp')
-rw-r--r-- | engines/kyra/sound_towns.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 4781ae14c5..bfc4655277 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -894,7 +894,7 @@ void MidiParser_EuD::resetTracking() { setTempo(_initialTempo); } -SoundTowns::SoundTowns(KyraEngine *engine, Audio::Mixer *mixer) : Sound(engine, mixer), _lastTrack(-1), +SoundTowns::SoundTowns(KyraEngine *vm, Audio::Mixer *mixer) : Sound(vm, mixer), _lastTrack(-1), _currentSFX(0), _sfxFileData(0), _sfxFileIndex((uint)-1), _sfxWDTable(0), _parser(0), _musicTrackData(0) { _driver = new FMT_EuphonyDriver(_mixer); @@ -920,9 +920,9 @@ SoundTowns::~SoundTowns() { } bool SoundTowns::init() { - _engine->checkCD(); + _vm->checkCD(); int unused = 0; - _sfxWDTable = _engine->staticres()->loadRawData(kKyra1TownsSFXTable, unused); + _sfxWDTable = _vm->staticres()->loadRawData(kKyra1TownsSFXTable, unused); return loadInstruments(); } @@ -1049,7 +1049,7 @@ void SoundTowns::loadSoundFile(uint file) { return; _sfxFileIndex = file; delete [] _sfxFileData; - _sfxFileData = _engine->resource()->fileData(soundFilename(file), 0); + _sfxFileData = _vm->resource()->fileData(soundFilename(file), 0); } void SoundTowns::playSoundEffect(uint8 track) { @@ -1182,7 +1182,7 @@ bool SoundTowns::loadInstruments() { _musicTrackData = new uint8[0xC58A]; memset(_musicTrackData, 0, 0xC58A); - uint8 * twm = _engine->resource()->fileData("twmusic.pak", 0); + uint8 * twm = _vm->resource()->fileData("twmusic.pak", 0); if (!twm) return false; Screen::decodeFrame4(twm, _musicTrackData, 0x8BF0); @@ -1201,7 +1201,7 @@ void SoundTowns::playEuphonyTrack(uint32 offset, int loop) { _musicTrackData = new uint8[0xC58A]; memset(_musicTrackData, 0, 0xC58A); - uint8 * twm = _engine->resource()->fileData("twmusic.pak", 0); + uint8 * twm = _vm->resource()->fileData("twmusic.pak", 0); Screen::decodeFrame4(twm + 0x4b70 + offset, _musicTrackData, 0xC58A); delete [] twm; |