[Scummvm-cvs-logs] SF.net SVN: scummvm: [30397] scummvm/trunk/engines/kyra/sound.h

[lordhoto at users.sourceforge.net]

Revision: 30397
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30397&view=rev
Author:   lordhoto
Date:     2008-01-10 16:33:45 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
Fix regression introduced with last commit. (Caused crash in Amiga version)

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound.h

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2008-01-10 23:32:19 UTC (rev 30396)
+++ scummvm/trunk/engines/kyra/sound.h	2008-01-11 00:33:45 UTC (rev 30397)
@@ -176,7 +176,7 @@
 	void voiceStop();
 
 protected:
-	const char *fileListEntry(int file) const { return (file < _soundDataList->_fileListLen) ? _soundDataList->_fileList[file] : ""; }
+	const char *fileListEntry(int file) const { return (_soundDataList != 0 && file >= 0 && file < _soundDataList->_fileListLen) ? _soundDataList->_fileList[file] : ""; }
 	const void *cdaData() const { return _soundDataList->_cdaTracks; }
 	const int cdaTrackNum() const { return _soundDataList->_cdaNumTracks; }
 


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