[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.117,1.118

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv23419/scumm

Modified Files:
	resource.cpp 
Log Message:

A nuke wasn't required after all


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- resource.cpp	5 Aug 2003 07:54:10 -0000	1.117
+++ resource.cpp	11 Aug 2003 02:06:35 -0000	1.118
@@ -921,7 +921,6 @@
 	if (music_type != 0x80) {
 		// It's an SFX; we don't know how to handle those yet
 		debug(4, "Sound %d not played, format not yet supported", idx);
-		nukeResource(type, idx);
 		res.roomoffs[type][idx] = 0xFFFFFFFF;
 		return 0;
 	}
@@ -947,8 +946,6 @@
 			
 	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