diff options
| author | Andrew Kurushin | 2005-01-11 21:10:36 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2005-01-11 21:10:36 +0000 |
| commit | 244b227b19b6bec659e4c00e2d7aa9596978cbe5 (patch) | |
| tree | f7a88160f68d6f4da5e5580ae13ce9bb382d7795 /saga/music.cpp | |
| parent | f1026ce3eb0bf4ad4e68987e4952dff141ccf331 (diff) | |
| download | scummvm-rg350-244b227b19b6bec659e4c00e2d7aa9596978cbe5.tar.gz scummvm-rg350-244b227b19b6bec659e4c00e2d7aa9596978cbe5.tar.bz2 scummvm-rg350-244b227b19b6bec659e4c00e2d7aa9596978cbe5.zip | |
- remove game.h & image.h
- all display information of current game goes to SagaEngine
- remove GameFontIds
- hide SagaEngine _gameId,_gameType & etc with methods getGameId(), getGameType()
svn-id: r16545
Diffstat (limited to 'saga/music.cpp')
| -rw-r--r-- | saga/music.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/saga/music.cpp b/saga/music.cpp index 8c1de67b37..634c40434d 100644 --- a/saga/music.cpp +++ b/saga/music.cpp @@ -138,7 +138,7 @@ void RAWInputStream::refill() { if (len & 1) len--; - if (_vm->_features & GF_BIG_ENDIAN_DATA) { + if (_vm->getFeatures() & GF_BIG_ENDIAN_DATA) { uint16 *ptr16 = (uint16 *)ptr; for (uint32 i = 0; i < (len / 2); i++) ptr16[i] = TO_BE_16(ptr16[i]); @@ -297,7 +297,7 @@ Music::Music(SoundMixer *mixer, MidiDriver *driver, int enabled) : _mixer(mixer) _musicInitialized = 1; _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume")); - if (_vm->_gameType == GType_ITE) { + if (_vm->getGameType() == GType_ITE) { File file; byte footerBuf[ARRAYSIZE(_digiTableITECD) * 8]; @@ -406,7 +406,7 @@ int Music::play(uint32 music_rn, uint16 flags) { MidiParser *parser; File midiFile; - if (_vm->_gameType == GType_ITE) { + if (_vm->getGameType() == GType_ITE) { if (music_rn >= 9 && music_rn <= 34) { if (flags == MUSIC_DEFAULT) { flags = _midiTableITECD[music_rn - 9].flags; @@ -456,7 +456,7 @@ int Music::play(uint32 music_rn, uint16 flags) { } else { // Load MIDI/XMI resource data - if (_vm->_gameType == GType_ITE) { + if (_vm->getGameType() == GType_ITE) { rsc_ctxt = _vm->getFileContext(GAME_RESOURCEFILE, 0); } else { // I've listened to music from both the FM and the GM |