[Scummvm-cvs-logs] SF.net SVN: scummvm:[46708] tools/branches/gsoc2009-gui/engines/scumm/ compress_scumm_bun.cpp

[sev at users.sourceforge.net]

Revision: 46708
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46708&view=rev
Author:   sev
Date:     2009-12-29 15:28:22 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
Fix compress_scumm_bun tool

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/engines/scumm/compress_scumm_bun.cpp

Modified: tools/branches/gsoc2009-gui/engines/scumm/compress_scumm_bun.cpp
===================================================================
--- tools/branches/gsoc2009-gui/engines/scumm/compress_scumm_bun.cpp	2009-12-29 12:25:53 UTC (rev 46707)
+++ tools/branches/gsoc2009-gui/engines/scumm/compress_scumm_bun.cpp	2009-12-29 15:28:22 UTC (rev 46708)
@@ -875,11 +875,11 @@
 		int size = _region[l].length;
 		int offset = _region[l].offset;
 		byte *outputData = convertTo16bit(ptr + offset, size, outputSize, bits, freq, channels);
-		sprintf(tmpPath, "%s/%s_reg%03d.wav", dir, filename, l);
+		sprintf(tmpPath, "%s%s_reg%03d.wav", dir, filename, l);
 		writeToTempWave(tmpPath, outputData, outputSize);
 		writeWaveHeader(_waveDataSize, freq, channels);
 		free(outputData);
-		sprintf(tmpPath, "%s/%s_reg%03d", dir, filename, l);
+		sprintf(tmpPath, "%s%s_reg%03d", dir, filename, l);
 
 		switch (gCompMode) {
 		case AUDIO_MP3:
@@ -895,22 +895,22 @@
 			error("Unknown encoding method");
 		}
 
-		sprintf(tmpPath, "%s/%s_reg%03d.wav", dir, filename, l);
+		sprintf(tmpPath, "%s%s_reg%03d.wav", dir, filename, l);
 		unlink(tmpPath);
 
 		int32 startPos = output.pos();
 		switch (gCompMode) {
 		case AUDIO_MP3:
 			sprintf(_cbundleTable[_cbundleCurIndex].filename, "%s_reg%03d.mp3", filename, l);
-			sprintf(tmpPath, "%s/%s_reg%03d.mp3", dir, filename, l);
+			sprintf(tmpPath, "%s%s_reg%03d.mp3", dir, filename, l);
 			break;
 		case AUDIO_VORBIS:
 			sprintf(_cbundleTable[_cbundleCurIndex].filename, "%s_reg%03d.ogg", filename, l);
-			sprintf(tmpPath, "%s/%s_reg%03d.ogg", dir, filename, l);
+			sprintf(tmpPath, "%s%s_reg%03d.ogg", dir, filename, l);
 			break;
 		case AUDIO_FLAC:
 			sprintf(_cbundleTable[_cbundleCurIndex].filename, "%s_reg%03d.fla", filename, l);
-			sprintf(tmpPath, "%s/%s_reg%03d.fla", dir, filename, l);
+			sprintf(tmpPath, "%s%s_reg%03d.fla", dir, filename, l);
 			break;
 		default:
 			error("Unknown encoding method");
@@ -1099,6 +1099,7 @@
 		outpath.setExtension(".bun");
 	}
 
+	outpath.setFullName(inpath.getName());
 	Common::File output(outpath, "wb");
 
 	output.writeUint32BE('LB23');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.