[Scummvm-cvs-logs] scummvm-tools master -> 9e68a0fab2c7191de3e41fd490d2f1b6a8d2f4e1

athrxx athrxx at scummvm.org
Fri Jun 10 01:15:07 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
9e68a0fab2 TOOLS: fixed bug #3314071 (broken compress_kyra tool)


Commit: 9e68a0fab2c7191de3e41fd490d2f1b6a8d2f4e1
    https://github.com/scummvm/scummvm-tools/commit/9e68a0fab2c7191de3e41fd490d2f1b6a8d2f4e1
Author: athrxx (athrxx at scummvm.org)
Date: 2011-06-09T16:13:36-07:00

Commit Message:
TOOLS: fixed bug #3314071 (broken compress_kyra tool)

(tool would break file names of ingame speech files)

Changed paths:
    engines/kyra/compress_kyra.cpp



diff --git a/engines/kyra/compress_kyra.cpp b/engines/kyra/compress_kyra.cpp
index 1185fa8..6e3418b 100644
--- a/engines/kyra/compress_kyra.cpp
+++ b/engines/kyra/compress_kyra.cpp
@@ -98,7 +98,11 @@ void CompressKyra::process(Common::Filename *infile, Common::Filename *outfile)
 		extractAndEncodeVOC(TEMP_RAW, tempFile, _format);
 		tempFile.close();
 
-		outputName.setExtension(audio_extensions(_format));
+		std::string ext = outputName.getExtension();
+		if (!ext.compare("VOC") || !ext.compare("voc") || !ext.compare("Voc"))
+			outputName.setExtension(audio_extensions(_format));
+		else
+			outputName.addExtension(audio_extensions(_format));
 
 		output.addFile(outputName.getFullPath().c_str(), tempEncoded);
 






More information about the Scummvm-git-logs mailing list