[Scummvm-cvs-logs] scummvm master -> e6f3b9d29f0fc695a616323be133f579c309388b

dreammaster dreammaster at scummvm.org
Fri Dec 11 04:30:14 CET 2015


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:
e6f3b9d29f ACCESS: Workaround for bad floppy English anim for librarian


Commit: e6f3b9d29f0fc695a616323be133f579c309388b
    https://github.com/scummvm/scummvm/commit/e6f3b9d29f0fc695a616323be133f579c309388b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-12-10T22:28:59-05:00

Commit Message:
ACCESS: Workaround for bad floppy English anim for librarian

Changed paths:
    engines/access/animation.cpp



diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 14d7c0d..259396f 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -53,6 +53,13 @@ Animation::Animation(AccessEngine *vm, Common::SeekableReadStream *stream) : Man
 	uint32 startOfs = stream->pos();
 
 	_type = stream->readByte();
+
+	// WORKAROUND: In Amazon floppy English, there's an animation associated with
+	// the librarian that isn't used, and has junk data. Luckily, it's animation
+	// type is also invalid, so if the _type isn't in range, exit immediately
+	if (_type < 0 || _type > 7)
+		return;
+
 	_scaling = stream->readSByte();
 	stream->readByte(); // unk
 	_frameNumber = stream->readByte();






More information about the Scummvm-git-logs mailing list