aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2008-01-11 00:33:45 +0000
committerJohannes Schickel2008-01-11 00:33:45 +0000
commitf510fb6b14ace362d96b0ea376b4dd539e68ab09 (patch)
tree569b5dd0fb555ca1f8927ad87ce3361635e8b6a2
parentcd2751c6986e8952c5c5b261e164bf991a9e54e7 (diff)
downloadscummvm-rg350-f510fb6b14ace362d96b0ea376b4dd539e68ab09.tar.gz
scummvm-rg350-f510fb6b14ace362d96b0ea376b4dd539e68ab09.tar.bz2
scummvm-rg350-f510fb6b14ace362d96b0ea376b4dd539e68ab09.zip
Fix regression introduced with last commit. (Caused crash in Amiga version)
svn-id: r30397
-rw-r--r--engines/kyra/sound.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 573c0b3109..3aceb97072 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -176,7 +176,7 @@ public:
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; }