[Scummvm-cvs-logs] scummvm master -> 6b41673fab3da5603b4947aad0839570efcfe165

[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:
4314a61ab4 SCI: Fixed a issue with signed characters in setChar()
6b41673fab SCI: Amiga SCI1 middle games are actually SCI1 late


Commit: 4314a61ab41644159f56a6eb886e74731d0729df
    https://github.com/scummvm/scummvm/commit/4314a61ab41644159f56a6eb886e74731d0729df
Author: md5 (md5 at scummvm.org)
Date: 2011-03-04T04:26:23-08:00

Commit Message:
SCI: Fixed a issue with signed characters in setChar()

This was visible in the password of LSL5 Amiga. Thanks to waltervn for
finding this

Changed paths:
    engines/sci/engine/seg_manager.cpp



diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index f77bdf6..f30f3ce 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -608,7 +608,7 @@ static inline char getChar(const SegmentRef &ref, uint offset) {
 	return (oddOffset ? val.offset >> 8 : val.offset & 0xff);
 }
 
-static inline void setChar(const SegmentRef &ref, uint offset, char value) {
+static inline void setChar(const SegmentRef &ref, uint offset, byte value) {
 	if (ref.skipByte)
 		offset++;
 


Commit: 6b41673fab3da5603b4947aad0839570efcfe165
    https://github.com/scummvm/scummvm/commit/6b41673fab3da5603b4947aad0839570efcfe165
Author: md5 (md5 at scummvm.org)
Date: 2011-03-04T04:27:25-08:00

Commit Message:
SCI: Amiga SCI1 middle games are actually SCI1 late

This fixes a lot of glitches, caused by the differences between the two
versions

Changed paths:
    engines/sci/graphics/transitions.cpp
    engines/sci/resource.cpp



diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index 7e7966b..7643812 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -108,8 +108,6 @@ void GfxTransitions::init() {
 
 	if (getSciVersion() >= SCI_VERSION_1_LATE)
 		_translationTable = NULL;
-	else if (g_sci->getResMan()->isAmiga32color())
-		_translationTable = NULL;
 	else
 		_translationTable = oldTransitionIDs;
 
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 1b3b481..75628d3 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -2255,6 +2255,9 @@ void ResourceManager::detectSciVersion() {
 	case kResVersionSci1Middle:
 	case kResVersionKQ5FMT:
 		s_sciVersion = SCI_VERSION_1_MIDDLE;
+		// Amiga SCI1 middle games are actually SCI1 late
+		if (_viewType == kViewAmiga)
+			s_sciVersion = SCI_VERSION_1_LATE;
 		return;
 	case kResVersionSci1Late:
 		if (_volVersion == kResVersionSci11) {