libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Voice sample support, again missing a required codec

Browse Source 
svn-id: r6195
This commit is contained in:
James Brown 2002-12-27 12:10:22 +00:00
parent c21bd9015a
commit 540667567e
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scumm/bundle.cpp
View File

@ -204,8 +204,14 @@ int32 Bundle::decompressMusicSampleByIndex(int32 index, int32 number, byte *comp
return final_size;
}
int32 Bundle::decompressVoiceSampleByName(char *name, byte *comp_final) {
int32 Bundle::decompressVoiceSampleByName(char *name, byte *comp_final, bool use_extended) {
int32 final_size = 0, i;
char realName[255];
if (use_extended)
sprintf(realName, "%s.IMX", name);
else
strcpy(realName, name);
if (_voiceFile.isOpen() == false) {
warning("Bundle: voice file is not open!");
@ -213,11 +219,12 @@ int32 Bundle::decompressVoiceSampleByName(char *name, byte *comp_final) {
}
for (i = 0; i < _numVoiceFiles; i++) {
if (!scumm_stricmp(name, _bundleVoiceTable[i].filename)) {
if (!scumm_stricmp(realName, _bundleVoiceTable[i].filename)) {
final_size = decompressVoiceSampleByIndex(i, comp_final);
return final_size;
}
}
printf("Failed finding voice %s\n", realName);
return final_size;
}

2
scumm/bundle.h
View File

@ -58,7 +58,7 @@ public:
bool openVoiceFile(const char *filename, const char *directory);
bool openMusicFile(const char *filename, const char *directory);
int32 decompressVoiceSampleByName(char *name, byte *comp_final);
int32 decompressVoiceSampleByName(char *name, byte *comp_final, bool use_extended=false);
int32 decompressVoiceSampleByIndex(int32 index, byte *comp_final);
int32 decompressMusicSampleByName(char *name, int32 number, byte *comp_final, bool fuzzy=false);
int32 decompressMusicSampleByIndex(int32 index, int32 number, byte *comp_final);

2
scumm/sound.cpp
View File

@ -1128,7 +1128,7 @@ int Sound::playBundleSound(char *sound) {
}
ptr = (byte *)malloc(1000000);
if (_scumm->_bundle->decompressVoiceSampleByName(sound, ptr) == 0) {
if (_scumm->_bundle->decompressVoiceSampleByName(sound, ptr, (_scumm->_gameId == GID_CMI)) == 0) {
delete ptr;
return -1;
}