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

[dreammaster]

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:
bd3f64a8cf ACCESS: Handle differences in CD vs Floppy establishment text offsets


Commit: bd3f64a8cf95278aa9ec70ce29d0c50f48a2e4a9
    https://github.com/scummvm/scummvm/commit/bd3f64a8cf95278aa9ec70ce29d0c50f48a2e4a9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-01-17T11:14:48-05:00

Commit Message:
ACCESS: Handle differences in CD vs Floppy establishment text offsets

Changed paths:
    engines/access/amazon/amazon_game.cpp



diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 8134ead..0a671d2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -617,7 +617,12 @@ void AmazonEngine::startChapter(int chapter) {
 
 	_establishGroup = 1;
 	loadEstablish(0x40 + _chapter);
-	uint16 msgOffset = READ_LE_UINT16(_establish->data() + ((0x40 + _chapter) * 2));
+
+	byte *entryOffset = _establish->data() + ((0x40 + _chapter) * 2);
+	if (isCD())
+		entryOffset += 2;
+
+	uint16 msgOffset = READ_LE_UINT16(entryOffset);
 	_printEnd = 170;
 
 	Common::String msg((const char *)_establish->data() + msgOffset);