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

[npjg]

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:
c9a1dfa75d DIRECTOR: Recenter stretched sprites
c0d295f4f9 DIRECTOR: Load multiple palettes


Commit: c9a1dfa75db6c9b832337a487b669a5577bda4d2
    https://github.com/scummvm/scummvm/commit/c9a1dfa75db6c9b832337a487b669a5577bda4d2
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-24T13:22:30-04:00

Commit Message:
DIRECTOR: Recenter stretched sprites

Changed paths:
    engines/director/channel.cpp


diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index 05969372a1..b849c51073 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -349,6 +349,10 @@ void Channel::addDelta(Common::Point pos) {
 Common::Point Channel::getPosition() {
 	Common::Point res = _currentPoint;
 	addRegistrationOffset(res);
+
+	res.x += (_sprite->_width - _width) / 2;
+	res.y += (_sprite->_height - _height) / 2;
+
 	return res;
 }
 


Commit: c0d295f4f9507e0ae25e52115ad1a309bb3787d1
    https://github.com/scummvm/scummvm/commit/c0d295f4f9507e0ae25e52115ad1a309bb3787d1
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-24T13:53:43-04:00

Commit Message:
DIRECTOR: Load multiple palettes

Also, don't set the current palette upon loading it.

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 7e05a381c6..09a0124576 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -205,19 +205,18 @@ bool Cast::loadArchive() {
 		_movie->_stageColor = 1;
 	}
 
-	if (clutList.size() > 1)
-		warning("More than one palette was found (%d)", clutList.size());
-
 	if (clutList.size() == 0) {
 		warning("CLUT resource not found, using default Mac palette");
 		_vm->setPalette(-1);
 	} else {
-		Common::SeekableSubReadStreamEndian *pal = _castArchive->getResource(MKTAG('C', 'L', 'U', 'T'), clutList[0]);
+		for (int i = 0; i < clutList.size(); i++) {
+			Common::SeekableSubReadStreamEndian *pal = _castArchive->getResource(MKTAG('C', 'L', 'U', 'T'), clutList[i]);
 
-		debugC(2, kDebugLoading, "****** Loading Palette CLUT, #%d", clutList[0]);
-		loadPalette(*pal);
+			debugC(2, kDebugLoading, "****** Loading Palette CLUT, #%d", clutList[i]);
+			loadPalette(*pal);
 
-		delete pal;
+			delete pal;
+		}
 	}
 
 	// Font Directory
@@ -607,7 +606,6 @@ void Cast::loadPalette(Common::SeekableSubReadStreamEndian &stream) {
 		stream.readByte();
 		index -= 3;
 	}
-	_vm->setPalette(_palette, steps);
 }
 
 void Cast::loadCastDataVWCR(Common::SeekableSubReadStreamEndian &stream) {