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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri Jan 11 01:35:39 CET 2008


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

Log Message:
-----------
Added some paranoia checks.

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

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2008-01-11 00:33:45 UTC (rev 30397)
+++ scummvm/trunk/engines/kyra/sound.h	2008-01-11 00:35:39 UTC (rev 30398)
@@ -177,8 +177,8 @@
 
 protected:
 	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; }
+	const void *cdaData() const { return _soundDataList != 0 ? _soundDataList->_cdaTracks : 0; }
+	const int cdaTrackNum() const { return _soundDataList != 0 ? _soundDataList->_cdaNumTracks : 0; }
 
 	int _musicEnabled;
 	bool _sfxEnabled;


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




More information about the Scummvm-git-logs mailing list