[Scummvm-cvs-logs] scummvm-tools master -> e26c3b964e4f7920c17d6cfa3e8b116ce12f0114

criezy criezy at scummvm.org
Mon Dec 12 22:03:25 CET 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:
e26c3b964e TOOLS: Commit patch #3456593


Commit: e26c3b964e4f7920c17d6cfa3e8b116ce12f0114
    https://github.com/scummvm/scummvm-tools/commit/e26c3b964e4f7920c17d6cfa3e8b116ce12f0114
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2011-12-12T13:02:55-08:00

Commit Message:
TOOLS: Commit patch #3456593

This fixes compression of floppy German Sam & Max monster.sou.

Changed paths:
    NEWS
    engines/scumm/compress_scumm_sou.cpp



diff --git a/NEWS b/NEWS
index 3c792a5..b0db8cf 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ For a more comprehensive changelog of the latest experimental code, see:
 1.5.0 (????-??-??)
  - Add two tools to extract and repackage the Soltys game data.
  - Fix bug #3093138: "compress_tucker with ScummVM CLI Tools not working".
+ - Fix bug #3280674: "ScummTools do not compress monster.sou of german fdd-version"
  - Fix various issues on case sensitive systems when looking for input files
    (e.g. in compress_tucker or compress_sword1 the sub-directories and input
    files needed to be all uppercase).
diff --git a/engines/scumm/compress_scumm_sou.cpp b/engines/scumm/compress_scumm_sou.cpp
index d5d20aa..da5af0d 100644
--- a/engines/scumm/compress_scumm_sou.cpp
+++ b/engines/scumm/compress_scumm_sou.cpp
@@ -117,6 +117,12 @@ bool CompressScummSou::get_part() {
 		tags--;
 	}
 
+	/* The German Sam & Max MONSTER.SOU seems to have a VCTL without an
+	 * associated SOU entry at the end (Bug ID 3280674). 
+	 */
+	if (_input.pos() == _file_size)
+		return false;
+
 	_input.read_throwsOnError(buf, 8);
 	if (!memcmp(buf, "Creative", 8))
 		_input.seek(18, SEEK_CUR);






More information about the Scummvm-git-logs mailing list