aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-08-05 07:54:10 +0000
committerTravis Howell2003-08-05 07:54:10 +0000
commit0d5875c7540b4bf98c4a791cc5830b290cf21e87 (patch)
tree649669fcf763ce1d0c9c330efad5a194f23b8ce1
parent8bf012d966013a12e7cd0cf797b672f6593f357f (diff)
downloadscummvm-rg350-0d5875c7540b4bf98c4a791cc5830b290cf21e87.tar.gz
scummvm-rg350-0d5875c7540b4bf98c4a791cc5830b290cf21e87.tar.bz2
scummvm-rg350-0d5875c7540b4bf98c4a791cc5830b290cf21e87.zip
nuke old resource again
svn-id: r9481
-rw-r--r--scumm/resource.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index aa190c8bbf..a096bed374 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -947,6 +947,8 @@ int Scumm::convertADResource(int type, int idx, byte * src_ptr, int size) {
track = src_ptr;
+ // Now nuke the old resource, and replace it with a new one
+ nukeResource(type, idx);
int total_size = 8 + 16 + 14 + 8 + 7 + 8*sizeof(ADLIB_INSTR_MIDI_HACK) + size;
total_size += 24; // Up to 24 additional bytes are needed for the jump sysex
@@ -1093,9 +1095,6 @@ int Scumm::convertADResource(int type, int idx, byte * src_ptr, int size) {
// Finally we reinsert the end of song sysex, just in case
memcpy(ptr, "\x00\xff\x2f\x00\x00", 5); ptr += 5;
- src_ptr+=size;
- size = 0;
-
return 1;
}