[Scummvm-git-logs] scummvm master -> 2a74a975a38fa7113b92d98d48ddc03c76437f3c

waltervn walter at vanniftrik-it.nl
Tue Jan 31 10:11:45 CET 2017


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:
2a74a975a3 ADL: Allow stray data bytes in pics


Commit: 2a74a975a38fa7113b92d98d48ddc03c76437f3c
    https://github.com/scummvm/scummvm/commit/2a74a975a38fa7113b92d98d48ddc03c76437f3c
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2017-01-31T10:05:29+01:00

Commit Message:
ADL: Allow stray data bytes in pics

This triggers in hires5, region 5, room 20

Changed paths:
    engines/adl/graphics.cpp


diff --git a/engines/adl/graphics.cpp b/engines/adl/graphics.cpp
index e1b7600..209f8a8 100644
--- a/engines/adl/graphics.cpp
+++ b/engines/adl/graphics.cpp
@@ -427,7 +427,10 @@ void Graphics_v2::drawPic(Common::SeekableReadStream &pic, const Common::Point &
 		case 0xff:
 			return;
 		default:
-			error("Invalid pic opcode %02x", opcode);
+			if (opcode >= 0xe0)
+				error("Invalid pic opcode %02x", opcode);
+			else
+				warning("Expected pic opcode, but found data byte %02x", opcode);
 		}
 	}
 }





More information about the Scummvm-git-logs mailing list