aboutsummaryrefslogtreecommitdiff
path: root/scumm/bundle.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-03-07 07:49:10 +0000
committerPaweł Kołodziejski2003-03-07 07:49:10 +0000
commit39510ce4cc4f0cefe79da06fedee2b1f36c752f9 (patch)
treea45f6effe92f82eb33c263751586ce5ce7cb64d9 /scumm/bundle.cpp
parent6c3ea05205feddffd1e8d0d83ea01e5c719ebfde (diff)
downloadscummvm-rg350-39510ce4cc4f0cefe79da06fedee2b1f36c752f9.tar.gz
scummvm-rg350-39510ce4cc4f0cefe79da06fedee2b1f36c752f9.tar.bz2
scummvm-rg350-39510ce4cc4f0cefe79da06fedee2b1f36c752f9.zip
changed voice buffer allocation to needed size
svn-id: r6737
Diffstat (limited to 'scumm/bundle.cpp')
-rw-r--r--scumm/bundle.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/scumm/bundle.cpp b/scumm/bundle.cpp
index 7c0e66fa47..bf0ad8ec4b 100644
--- a/scumm/bundle.cpp
+++ b/scumm/bundle.cpp
@@ -238,7 +238,7 @@ bool Bundle::openMusicFile(const char *filename, const char *directory) {
return true;
}
-int32 Bundle::decompressVoiceSampleByIndex(int32 index, byte *comp_final) {
+int32 Bundle::decompressVoiceSampleByIndex(int32 index, byte **comp_final) {
int32 i, tag, num, final_size, output_size;
byte *comp_input, *comp_output;
@@ -273,6 +273,8 @@ int32 Bundle::decompressVoiceSampleByIndex(int32 index, byte *comp_final) {
comp_output = (byte *)malloc(0x2000);
+ *comp_final = (byte *)malloc(0x2000 * num);
+
for (i = 0; i < num; i++) {
comp_input = (byte *)malloc(_compVoiceTable[i].size);
@@ -281,7 +283,7 @@ int32 Bundle::decompressVoiceSampleByIndex(int32 index, byte *comp_final) {
output_size = decompressCodec(_compVoiceTable[i].codec, comp_input, comp_output, _compVoiceTable[i].size);
assert(output_size <= 0x2000);
- memcpy(comp_final + final_size, comp_output, output_size);
+ memcpy(*comp_final + final_size, comp_output, output_size);
final_size += output_size;
free(comp_input);
@@ -339,7 +341,7 @@ 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) {
int32 final_size = 0, i;
if (_voiceFile.isOpen() == false) {