[Scummvm-git-logs] scummvm master -> 973aef55743a26cdf6d754e921fde98c74e1434c
fuzzie
fuzzie at fuzzie.org
Sat Dec 17 17:20:31 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
973aef5574 ADL: Only warn about (and skip) sectors with invalid NIB checksums.
Commit: 973aef55743a26cdf6d754e921fde98c74e1434c
https://github.com/scummvm/scummvm/commit/973aef55743a26cdf6d754e921fde98c74e1434c
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2016-12-17T17:20:06+01:00
Commit Message:
ADL: Only warn about (and skip) sectors with invalid NIB checksums.
Changed paths:
engines/adl/disk.cpp
diff --git a/engines/adl/disk.cpp b/engines/adl/disk.cpp
index 0de740e..d07e0c5 100644
--- a/engines/adl/disk.cpp
+++ b/engines/adl/disk.cpp
@@ -117,8 +117,11 @@ static Common::SeekableReadStream *readImage_NIB(const Common::String &filename)
track = read44(buffer, pos);
sector = read44(buffer, pos);
uint8 checksum = read44(buffer, pos);
- if ((volNo ^ track ^ sector) != checksum)
- error("invalid NIB checksum");
+ if ((volNo ^ track ^ sector) != checksum) {
+ warning("invalid NIB checksum (volNo %d, track %d, sector %d)", volNo, track, sector);
+ sawAddress = false;
+ continue;
+ }
if (!firstGoodTrackPos)
firstGoodTrackPos = pos;
More information about the Scummvm-git-logs
mailing list