[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_bndmgr.cpp,1.28,1.29 dimuse_sndmgr.cpp,1.66,1.67

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8969

Modified Files:
	dimuse_bndmgr.cpp dimuse_sndmgr.cpp 
Log Message:
return null if sound is not found

Index: dimuse_bndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- dimuse_bndmgr.cpp	25 Jan 2005 22:21:08 -0000	1.28
+++ dimuse_bndmgr.cpp	6 Feb 2005 10:09:37 -0000	1.29
@@ -140,10 +140,11 @@
 			_file.seek(_bundleTable[i].offset, SEEK_SET);
 			offset = _bundleTable[i].offset;
 			size = _bundleTable[i].size;
-			break;
+			return &_file;
 		}
 	}
-	return &_file;
+
+	return NULL;
 }
 
 bool BundleMgr::open(const char *filename, bool &compressed) {

Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- dimuse_sndmgr.cpp	30 Jan 2005 20:45:02 -0000	1.66
+++ dimuse_sndmgr.cpp	6 Feb 2005 10:09:37 -0000	1.67
@@ -366,6 +366,10 @@
 			int32 offset = 0, size = 0;
 			sprintf(fileName, "%s.map", soundName);
 			File *rmapFile = sound->bundle->getFile(fileName, offset, size);
+			if (!rmapFile) {
+				closeSound(sound);
+				return NULL;
+			}
 			prepareSoundFromRMAP(rmapFile, sound, offset, size);
 			strcpy(sound->name, soundName);
 			sound->soundId = soundId;