[Scummvm-cvs-logs] scummvm master -> 8965077226831fe6e82febbee31152b16b6ba31a

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
30b6a479e5 SCUMM: Fix bug #6679 - INDY3 DOS-EGA: book of maps graphic glitch
8965077226 Merge pull request #527 from rrebello/bugfix-6679


Commit: 30b6a479e5b1510cb5157c72decdb24aa4c24ed1
    https://github.com/scummvm/scummvm/commit/30b6a479e5b1510cb5157c72decdb24aa4c24ed1
Author: Rodrigo Rebello (rprebello at gmail.com)
Date: 2014-11-30T13:30:00-02:00

Commit Message:
SCUMM: Fix bug #6679 - INDY3 DOS-EGA: book of maps graphic glitch

Force correct width value for room 64 (book of maps) in Indy3. This
works around the wrong value stored in the data files of a specific
version of the game (DOS/EGA v1.0, according to scumm-md5.txt).

Changed paths:
    engines/scumm/room.cpp



diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index 3828629..4b59e22 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -614,6 +614,15 @@ void ScummEngine_v3old::setupRoomSubBlocks() {
 		}
 	} else {
 		_roomWidth = READ_LE_UINT16(&(rmhd->old.width));
+
+		// WORKAROUND: Fix bad width value for room 64 (book of maps) in
+		// Indy3. A specific version of this game (DOS/EGA v1.0, according to
+		// scumm-md5.txt) has a wrong width of 1793 stored in the data files,
+		// which causes a strange situation in which the book view may scroll
+		// towards the right depending on Indy's position from the previous room.
+		// Fixes bug #6679.
+		if (_game.id == GID_INDY3 && _roomResource == 64 && _roomWidth == 1793)
+			_roomWidth = 320;
 		_roomHeight = READ_LE_UINT16(&(rmhd->old.height));
 	}
 	_numObjectsInRoom = roomptr[20];


Commit: 8965077226831fe6e82febbee31152b16b6ba31a
    https://github.com/scummvm/scummvm/commit/8965077226831fe6e82febbee31152b16b6ba31a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-11-30T21:13:49+02:00

Commit Message:
Merge pull request #527 from rrebello/bugfix-6679

SCUMM: Fix bug #6679 - INDY3 DOS-EGA: book of maps graphic glitch

Changed paths:
    engines/scumm/room.cpp