libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 08:55:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

COMI demos only have 3 fonts files.

Browse Source 
Don't do CD checks for COMI demos

svn-id: r11336
This commit is contained in:
Travis Howell 2003-11-18 01:57:00 +00:00
parent 632e88459b
commit 3ce3b33c62
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/smush/smush_player.cpp
View File

@ -844,7 +844,7 @@ void SmushPlayer::setupAnim(const char *file, const char *directory) {
}
} else if (_scumm->_gameId == GID_CMI) {
for (i = 0; i < 5; i++) {
if ((_scumm->_features & GF_DEMO) && (i == 5))
if ((_scumm->_features & GF_DEMO) && (i == 4))
break;
sprintf(file_font, "font%d.nut", i);
_sf[i] = new SmushFont(false, true);

42
scumm/sound.cpp
View File

@ -1056,18 +1056,26 @@ void Sound::playBundleMusic(const char *song) {
_outputMixerSize = (22050 * 2 * 2);
char bunfile[20];
sprintf(bunfile, "musdisk%d.bun", _scumm->VAR(_scumm->VAR_CURRENTDISK));
if (_musicDisk != _scumm->VAR(_scumm->VAR_CURRENTDISK))
_bundle->closeMusicFile();
if (_bundle->openMusicFile(bunfile, _scumm->getGameDataPath()) == false) {
if (_scumm->_features & GF_DEMO) {
if (_bundle->openMusicFile("music.bun", _scumm->getGameDataPath()) == false) {
_outputMixerSize = 0;
return;
}
}
} else {
_musicDisk = (byte)_scumm->VAR(_scumm->VAR_CURRENTDISK);
sprintf(bunfile, "musdisk%d.bun", _scumm->VAR(_scumm->VAR_CURRENTDISK));
if (_musicDisk != _scumm->VAR(_scumm->VAR_CURRENTDISK))
_bundle->closeMusicFile();
if (_bundle->openMusicFile(bunfile, _scumm->getGameDataPath()) == false) {
if (_bundle->openMusicFile("music.bun", _scumm->getGameDataPath()) == false) {
_outputMixerSize = 0;
return;
}
}
_musicDisk = (byte)_scumm->VAR(_scumm->VAR_CURRENTDISK);
}
} else {
_outputMixerSize = ((22050 * 2 * 2) / 4) * 3;
@ -1235,15 +1243,19 @@ void Sound::playBundleSound(char *sound, PlayingSoundHandle *handle) {
if (_scumm->_gameId == GID_CMI) {
char voxfile[20];
sprintf(voxfile, "voxdisk%d.bun", _scumm->VAR(_scumm->VAR_CURRENTDISK));
if (_voiceDisk != _scumm->VAR(_scumm->VAR_CURRENTDISK))
_bundle->closeVoiceFile();
result = _bundle->openVoiceFile(voxfile, _scumm->getGameDataPath());
if (result == false)
if (_scumm->_features & GF_DEMO) {
result = _bundle->openVoiceFile("voice.bun", _scumm->getGameDataPath());
_voiceDisk = (byte)_scumm->VAR(_scumm->VAR_CURRENTDISK);
} else {
sprintf(voxfile, "voxdisk%d.bun", _scumm->VAR(_scumm->VAR_CURRENTDISK));
if (_voiceDisk != _scumm->VAR(_scumm->VAR_CURRENTDISK))
_bundle->closeVoiceFile();
result = _bundle->openVoiceFile(voxfile, _scumm->getGameDataPath());
if (result == false)
result = _bundle->openVoiceFile("voice.bun", _scumm->getGameDataPath());
_voiceDisk = (byte)_scumm->VAR(_scumm->VAR_CURRENTDISK);
}
} else if (_scumm->_gameId == GID_DIG)
result = _bundle->openVoiceFile("digvoice.bun", _scumm->getGameDataPath());
else