[Scummvm-git-logs] scummvm-tools master -> b2b487ab5dcbabd6920e5211dbfa3049ffd9e10e

[sev-]

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:
b2b487ab5d SCUMM: Fully encrypt resulting files from C64 disk images, fixes bug#12303


Commit: b2b487ab5dcbabd6920e5211dbfa3049ffd9e10e
    https://github.com/scummvm/scummvm-tools/commit/b2b487ab5dcbabd6920e5211dbfa3049ffd9e10e
Author: Ben Castricum (github at bencastricum.nl)
Date: 2021-08-19T12:30:35+02:00

Commit Message:
SCUMM: Fully encrypt resulting files from C64 disk images, fixes bug#12303

The data on the .d64 images is not XORed.
The c64 extraction tool XORs only room 0 (index) with 0xFF
ScummVM expects all files to be XORed with 0xFF

With this patch all files are XORed, which is what ScummVM expects.

Fixes bug#12303

Changed paths:
    engines/scumm/extract_mm_c64.cpp
    engines/scumm/extract_zak_c64.cpp


diff --git a/engines/scumm/extract_mm_c64.cpp b/engines/scumm/extract_mm_c64.cpp
index ba8384b41..8696fa01a 100644
--- a/engines/scumm/extract_mm_c64.cpp
+++ b/engines/scumm/extract_mm_c64.cpp
@@ -137,6 +137,7 @@ void ExtractMMC64::execute() {
 		sprintf(fname, "%02i.LFL", i);
 		outpath.setFullName(fname);
 		output.open(outpath, "wb");
+		output.setXorMode(0xFF);
 
 		print("Creating %s...", fname);
 		input->seek((SectorOffset[room_tracks[i]] + room_sectors[i]) * 256, SEEK_SET);
diff --git a/engines/scumm/extract_zak_c64.cpp b/engines/scumm/extract_zak_c64.cpp
index d4825a590..d9a6d5c1a 100644
--- a/engines/scumm/extract_zak_c64.cpp
+++ b/engines/scumm/extract_zak_c64.cpp
@@ -139,6 +139,7 @@ void ExtractZakC64::execute() {
 		sprintf(fname, "%02i.LFL", i);
 		outpath.setFullName(fname);
 		output.open(outpath, "wb");
+		output.setXorMode(0xFF);
 
 		print("Creating %s...", fname);
 		input->seek((SectorOffset[room_tracks_c64[i]] + room_sectors_c64[i]) * 256, SEEK_SET);