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

[DrMcCoy]

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:
aca13f7ba9 GOB: Work around broken resource sizes in Gobliiins EGA


Commit: aca13f7ba95f0707d6d68fb52bfa36b1d420a42c
    https://github.com/scummvm/scummvm/commit/aca13f7ba95f0707d6d68fb52bfa36b1d420a42c
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2016-07-20T21:59:22+02:00

Commit Message:
GOB: Work around broken resource sizes in Gobliiins EGA

The EGA version of Gobliiins, similar to Little Red Riding Hood,
claims a few resources are larger than they actually are. The original
happily reads past the resource structure, but we'll instead fix
the size of the resource after loading.

This fixes bug #7162.

Changed paths:
    engines/gob/gob.cpp



diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index b51a638..dfbff33 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -429,6 +429,23 @@ Common::Error GobEngine::initGameParts() {
 		_map      = new Map_v1(this);
 		_goblin   = new Goblin_v1(this);
 		_scenery  = new Scenery_v1(this);
+
+		// WORKAROUND: The EGA version of Gobliiins claims a few resources are
+		//             larger than they actually are. The original happily reads
+		//             past the resource structure boundary, but we don't.
+		//             To make sure we don't throw an error like we normally do
+		//             (which leads to these resources not loading), we enable
+		//             this workaround that automatically fixes the resources
+		//             sizes.
+		//
+		//             This glitch is visible in levels
+		//             - 03 (ICIGCAA)
+		//             - 09 (ICVGCGT)
+		//             - 16 (TCVQRPM)
+		//             - 20 (NNGWTTO)
+		//             See also ScummVM bug report #7162.
+		if (isEGA())
+			_resourceSizeWorkaround = true;
 		break;
 
 	case kGameTypeGeisha: