[Scummvm-cvs-logs] SF.net SVN: scummvm:[33526] scummvm/trunk/engines/kyra/kyra_lok.cpp

[lordhoto at users.sourceforge.net]

Revision: 33526
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33526&view=rev
Author:   lordhoto
Date:     2008-08-02 14:42:44 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Fixed yet another crash in kyra1 amiga.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_lok.cpp

Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp	2008-08-02 14:37:10 UTC (rev 33525)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp	2008-08-02 14:42:44 UTC (rev 33526)
@@ -174,7 +174,8 @@
 
 	initStaticResource();
 
-	_sound->setSoundList(&_soundData[kMusicIntro]);
+	if (_soundData)
+		_sound->setSoundList(&_soundData[kMusicIntro]);
 
 	_trackMap = _dosTrackMap;
 	_trackMapSize = _dosTrackMapSize;
@@ -317,7 +318,8 @@
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.