[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.70,2.71 sound.cpp,1.275,1.276

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31758/scumm

Modified Files:
	charset.cpp sound.cpp 
Log Message:

Alter old demo check
Stop crash on exit with comi demo


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.70
retrieving revision 2.71
diff -u -d -r2.70 -r2.71
--- charset.cpp	18 Nov 2003 02:09:51 -0000	2.70
+++ charset.cpp	18 Nov 2003 05:14:17 -0000	2.71
@@ -1238,8 +1238,11 @@
 }
 
 CharsetRendererNut::~CharsetRendererNut() {
-	for (int i = 0; i < 5; i++)
+	for (int i = 0; i < 5; i++) {
+		if ((_vm->_gameId == GID_CMI) && (_vm->_features & GF_DEMO) && (i == 4))
+			break;
 		delete _fr[i];
+	}
 }
 
 void CharsetRendererNut::setCurID(byte id) {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- sound.cpp	18 Nov 2003 01:56:59 -0000	1.275
+++ sound.cpp	18 Nov 2003 05:14:18 -0000	1.276
@@ -1242,10 +1242,10 @@
 		return;	
 
 	if (_scumm->_gameId == GID_CMI) {
-		char voxfile[20];
 		if (_scumm->_features & GF_DEMO) {
 			result = _bundle->openVoiceFile("voice.bun", _scumm->getGameDataPath());
 		} else {
+			char voxfile[20];
 			sprintf(voxfile, "voxdisk%d.bun", _scumm->VAR(_scumm->VAR_CURRENTDISK));
 			if (_voiceDisk != _scumm->VAR(_scumm->VAR_CURRENTDISK))
 				_bundle->closeVoiceFile();
@@ -1270,7 +1270,7 @@
 	if (_scumm->_gameId == GID_CMI) {
 		char name[20];
 		strcpy(name, sound);
-		if (_scumm->_maxRooms != 6) // CMI demo does not have .IMX for voice but does for music...
+		if (!(_scumm->_features & GF_DEMO)) // CMI demo does not have .IMX for voice but does for music...
 			strcat(name, ".IMX");
 		output_size = _bundle->decompressVoiceSampleByName(name, &ptr);
 	} else {