diff options
author | Christopher Page | 2008-08-10 21:58:18 +0000 |
---|---|---|
committer | Christopher Page | 2008-08-10 21:58:18 +0000 |
commit | fcc00f20b93d719c9f7bce848ed7c3600be982b9 (patch) | |
tree | 48b9fd1c842cb376985a91592ef7b062fed0cfa7 /engines/kyra/kyra_lok.cpp | |
parent | ce3d1e1a7d9ec9860d3fc42d8127a1634051d950 (diff) | |
parent | 9d0b0523cf119fdc400bf477c2f9d6f4f37ddce6 (diff) | |
download | scummvm-rg350-fcc00f20b93d719c9f7bce848ed7c3600be982b9.tar.gz scummvm-rg350-fcc00f20b93d719c9f7bce848ed7c3600be982b9.tar.bz2 scummvm-rg350-fcc00f20b93d719c9f7bce848ed7c3600be982b9.zip |
Merged revisions 33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r33769
Diffstat (limited to 'engines/kyra/kyra_lok.cpp')
-rw-r--r-- | engines/kyra/kyra_lok.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index f668ae8401..afd164958c 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -173,8 +173,7 @@ int KyraEngine_LoK::init() { initStaticResource(); - if (_soundData) - _sound->setSoundList(&_soundData[kMusicIntro]); + _sound->setSoundList(&_soundData[kMusicIntro]); _trackMap = _dosTrackMap; _trackMapSize = _dosTrackMapSize; @@ -317,8 +316,7 @@ void KyraEngine_LoK::startup() { debugC(9, kDebugLevelMain, "KyraEngine_LoK::startup()"); static const uint8 colorMap[] = { 0, 0, 0, 0, 12, 12, 12, 0, 0, 0, 0, 0 }; _screen->setTextColorMap(colorMap); - if (_soundData) - _sound->setSoundList(&_soundData[kMusicIngame]); + _sound->setSoundList(&_soundData[kMusicIngame]); _sound->loadSoundFile(0); // _screen->setFont(Screen::FID_6_FNT); _screen->setAnimBlockPtr(3750); |