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

Travis Howell kirben at users.sourceforge.net
Tue Aug 5 00:55:01 CEST 2003


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

Modified Files:
	resource.cpp 
Log Message:

nuke old resource again


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- resource.cpp	5 Aug 2003 05:21:56 -0000	1.116
+++ resource.cpp	5 Aug 2003 07:54:10 -0000	1.117
@@ -947,6 +947,8 @@
 			
 	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 @@
 	// 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;
 }
 





More information about the Scummvm-git-logs mailing list