From 3a64d35dfd9126d7912c4d4496030f7ed120d660 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 4 Jun 2009 01:05:47 +0000
Subject: Add 16bit color support for later HE games.

svn-id: r41153
---
 engines/scumm/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm/actor.cpp')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index cf90094112..eea1ec070b 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2384,7 +2384,7 @@ void ScummEngine_v71he::postProcessAuxQueue() {
 					uint8 *dst2 = pvs->getBackPixels(0, pvs->topline);
 					switch (comp) {
 					case 1:
-						Wiz::copyAuxImage(dst1, dst2, axfd + 10, pvs->w, pvs->h, x, y, w, h);
+						Wiz::copyAuxImage(dst1, dst2, axfd + 10, pvs->pitch, pvs->h, x, y, w, h, _bitDepth);
 						break;
 					default:
 						error("unimplemented compression type %d", comp);
-- 
cgit v1.2.3


From fdbc49ab5f4b9320e4cdac8edd427304910d8235 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 4 Jun 2009 11:03:45 +0000
Subject: Fix the color of Poodles Galore's finger nails in Spy Fox 3.

svn-id: r41162
---
 engines/scumm/actor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines/scumm/actor.cpp')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index eea1ec070b..f3c8e2ff6b 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2484,9 +2484,10 @@ void Actor::saveLoadWithSerializer(Serializer *ser) {
 		MKLINE(Actor, _flip, sleByte, VER(32)),
 		MKLINE(Actor, _heSkipLimbs, sleByte, VER(32)),
 
-		// Actor palette grew from 64 to 256 bytes
+		// Actor palette grew from 64 to 256 bytes and switched to uint16 in HE games
 		MKARRAY_OLD(Actor, _palette[0], sleByte, 64, VER(8), VER(9)),
-		MKARRAY(Actor, _palette[0], sleByte, 256, VER(10)),
+		MKARRAY_OLD(Actor, _palette[0], sleByte, 256, VER(10), VER(77)),
+		MKARRAY(Actor, _palette[0], sleUint16, 256, VER(78)),
 
 		MK_OBSOLETE(Actor, _mask, sleByte, VER(8), VER(9)),
 		MKLINE(Actor, _shadowMode, sleByte, VER(8)),
-- 
cgit v1.2.3


From 7123fbdd7095257c9c23102f7d86d2c8cf21cfd0 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 18 Jun 2009 07:12:53 +0000
Subject: Merged revisions 41625 via svnmerge from
 https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r41625 | Kirben | 2009-06-18 16:18:31 +1000 (Thu, 18 Jun 2009) | 1 line
  
  Correct actor layering method in HE90+ games.
........

svn-id: r41626
---
 engines/scumm/actor.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'engines/scumm/actor.cpp')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index f3c8e2ff6b..52866279b8 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1348,6 +1348,22 @@ void ScummEngine::processActors() {
 				}
 			}
 		}
+	} else if (_game.heversion >= 90) {
+		for (int j = 0; j < numactors; ++j) {
+			for (int i = 0; i < numactors; ++i) {
+				int sc_actor1 = _sortedActors[j]->_layer;
+				int sc_actor2 = _sortedActors[i]->_layer;
+				if (sc_actor1 < sc_actor2) {
+					SWAP(_sortedActors[i], _sortedActors[j]);
+				} else if (sc_actor1 == sc_actor2) {
+					sc_actor1 = _sortedActors[j]->getPos().y;
+					sc_actor2 = _sortedActors[i]->getPos().y;
+					if (sc_actor1 < sc_actor2) {
+						SWAP(_sortedActors[i], _sortedActors[j]);
+					}
+				}
+			}
+		}
 	} else {
 		for (int j = 0; j < numactors; ++j) {
 			for (int i = 0; i < numactors; ++i) {
-- 
cgit v1.2.3


From 43d57fd333afa54f4e85f30e2ef8231444988066 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 16 Aug 2009 01:46:47 +0000
Subject: Update branch specific save game changes, to prevent conflicts.

svn-id: r43421
---
 engines/scumm/actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/scumm/actor.cpp')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 227ae1d316..9dab776b67 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2553,8 +2553,8 @@ void Actor::saveLoadWithSerializer(Serializer *ser) {
 
 		// Actor palette grew from 64 to 256 bytes and switched to uint16 in HE games
 		MKARRAY_OLD(Actor, _palette[0], sleByte, 64, VER(8), VER(9)),
-		MKARRAY_OLD(Actor, _palette[0], sleByte, 256, VER(10), VER(77)),
-		MKARRAY(Actor, _palette[0], sleUint16, 256, VER(78)),
+		MKARRAY_OLD(Actor, _palette[0], sleByte, 256, VER(10), VER(79)),
+		MKARRAY(Actor, _palette[0], sleUint16, 256, VER(80)),
 
 		MK_OBSOLETE(Actor, _mask, sleByte, VER(8), VER(9)),
 		MKLINE(Actor, _shadowMode, sleByte, VER(8)),
-- 
cgit v1.2.3