diff options
| author | Johannes Schickel | 2008-08-02 14:42:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-08-02 14:42:44 +0000 |
| commit | 6e9bbd734892a9ba25c8638f769e97ca0681d1ea (patch) | |
| tree | a6d96ca7248ae7733ab6a5da2d0726aa159ef518 /engines/kyra | |
| parent | 2d647afbbfdbd562c3f1c53c486407efaf358ae8 (diff) | |
| download | scummvm-rg350-6e9bbd734892a9ba25c8638f769e97ca0681d1ea.tar.gz scummvm-rg350-6e9bbd734892a9ba25c8638f769e97ca0681d1ea.tar.bz2 scummvm-rg350-6e9bbd734892a9ba25c8638f769e97ca0681d1ea.zip | |
Fixed yet another crash in kyra1 amiga.
svn-id: r33526
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_lok.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index c852f6e3ee..db3a8fb627 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -174,7 +174,8 @@ int KyraEngine_LoK::init() { initStaticResource(); - _sound->setSoundList(&_soundData[kMusicIntro]); + if (_soundData) + _sound->setSoundList(&_soundData[kMusicIntro]); _trackMap = _dosTrackMap; _trackMapSize = _dosTrackMapSize; @@ -317,7 +318,8 @@ 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); - _sound->setSoundList(&_soundData[kMusicIngame]); + if (_soundData) + _sound->setSoundList(&_soundData[kMusicIngame]); _sound->loadSoundFile(0); // _screen->setFont(Screen::FID_6_FNT); _screen->setAnimBlockPtr(3750); |