thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Alter old demo check

Browse source 
Stop crash on exit with comi demo

svn-id: r11341
This commit is contained in:
Travis Howell 2003-11-18 05:14:18 +00:00
parent 5589cdc10c
commit c90d4c4e08
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scumm/charset.cpp
View file

@ -1238,8 +1238,11 @@ CharsetRendererNut::CharsetRendererNut(ScummEngine *vm)
} }
CharsetRendererNut::~CharsetRendererNut() { 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]; delete _fr[i];
}
} }
void CharsetRendererNut::setCurID(byte id) { void CharsetRendererNut::setCurID(byte id) {

4
scumm/sound.cpp
View file

@ -1242,10 +1242,10 @@ void Sound::playBundleSound(char *sound, PlayingSoundHandle *handle) {
return; return;
if (_scumm->_gameId == GID_CMI) { if (_scumm->_gameId == GID_CMI) {
char voxfile[20];
if (_scumm->_features & GF_DEMO) { if (_scumm->_features & GF_DEMO) {
result = _bundle->openVoiceFile("voice.bun", _scumm->getGameDataPath()); result = _bundle->openVoiceFile("voice.bun", _scumm->getGameDataPath());
} else { } else {
char voxfile[20];
sprintf(voxfile, "voxdisk%d.bun", _scumm->VAR(_scumm->VAR_CURRENTDISK)); sprintf(voxfile, "voxdisk%d.bun", _scumm->VAR(_scumm->VAR_CURRENTDISK));
if (_voiceDisk != _scumm->VAR(_scumm->VAR_CURRENTDISK)) if (_voiceDisk != _scumm->VAR(_scumm->VAR_CURRENTDISK))
_bundle->closeVoiceFile(); _bundle->closeVoiceFile();
@ -1270,7 +1270,7 @@ void Sound::playBundleSound(char *sound, PlayingSoundHandle *handle) {
if (_scumm->_gameId == GID_CMI) { if (_scumm->_gameId == GID_CMI) {
char name[20]; char name[20];
strcpy(name, sound); 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"); strcat(name, ".IMX");
output_size = _bundle->decompressVoiceSampleByName(name, &ptr); output_size = _bundle->decompressVoiceSampleByName(name, &ptr);
} else { } else {