[Scummvm-git-logs] scummvm master -> b5bd7b8478615ca604afcc28d1a0d4137ef1a4b9

[csnover]

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:
3ef0802993 TITANIC: Fix buffer overflow when getting first class upgrade
b5bd7b8478 SCI32: Stop blacklisting 37.MAP from Phantasmagoria


Commit: 3ef080299336e1e1665deceea5539c34d4093024
    https://github.com/scummvm/scummvm/commit/3ef080299336e1e1665deceea5539c34d4093024
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-08-25T18:53:20-05:00

Commit Message:
TITANIC: Fix buffer overflow when getting first class upgrade

Changed paths:
    engines/titanic/gfx/text_control.cpp


diff --git a/engines/titanic/gfx/text_control.cpp b/engines/titanic/gfx/text_control.cpp
index d1d2e1c..b0d1cd9 100644
--- a/engines/titanic/gfx/text_control.cpp
+++ b/engines/titanic/gfx/text_control.cpp
@@ -263,7 +263,7 @@ void CTextControl::remapColors(uint count, uint *srcColors, uint *destColors) {
 		for (uint index = 0; index < count; ++index) {
 			if (color == srcColors[index]) {
 				// Found a match, so replace the color
-				setLineColor(lineNum, destColors[lineNum]);
+				setLineColor(lineNum, destColors[index]);
 				break;
 			}
 		}


Commit: b5bd7b8478615ca604afcc28d1a0d4137ef1a4b9
    https://github.com/scummvm/scummvm/commit/b5bd7b8478615ca604afcc28d1a0d4137ef1a4b9
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-08-25T18:53:32-05:00

Commit Message:
SCI32: Stop blacklisting 37.MAP from Phantasmagoria

It turns out that GOG.com version of Phantasmagoria needs the
37.MAP patch file because for some reason the 37.MAP in RESSCI.000
is empty (36 bytes, versus the correct file which is ~1kB).
Fortunately, this file is the same across all CDs in the original
US release, so hopefully unblocking this patch will not cause any
problems for any of the CD releases either.

Fixes Trac#10161.

Changed paths:
    engines/sci/resource.cpp


diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 91cdfd2..9cca933 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1434,14 +1434,13 @@ bool ResourceManager::isBlacklistedPatch(const ResourceId &resId) const {
 			resId.getNumber() == 65535;
 	case GID_PHANTASMAGORIA:
 		// The GOG release of Phantasmagoria 1 merges all resources into a
-		// single-disc bundle, but they also include the 65535.MAP & 37.MAP
-		// patch files from original game's CD 1, which (of course) do not
-		// contain the entries for audio from later CDs. So, just ignore these
-		// map patches since the correct maps will be found in the RESSCI.000
-		// file. This also helps eliminate user error when copying files from
-		// the original CDs.
-		return resId.getType() == kResourceTypeMap &&
-			(resId.getNumber() == 65535 || resId.getNumber() == 37);
+		// single-disc bundle, but they also include the 65535.MAP from the
+		// original game's CD 1, which does not contain the entries for sound
+		// effects from later CDs. So, just ignore this map patch since the
+		// correct maps will be found in the RESSCI.000 file. This also helps
+		// eliminate user error when copying files from the original CDs, since
+		// each CD had a different 65535.MAP patch file.
+		return resId.getType() == kResourceTypeMap && resId.getNumber() == 65535;
 	default:
 		return false;
 	}